aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix inability to dismiss Assistant answer when launcher frontmost" into ub-launcher3-qt-r1-dev

Browse Source 
am: 290a9a814a

Change-Id: I128fb662ea38a00f3a14734aae9c5c1bbb849b09
This commit is contained in:
James O'Leary
2019-08-05 15:20:46 -07:00
committed by android-build-merger
parent ccf108c5f3 290a9a814a
commit c714f1657b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
View File

@@ -657,10 +657,12 @@ public class TouchInteractionService extends Service implements
// In the case where we are in the excluded assistant state, ignore it and treat the
// running activity as the task behind the assistant
runningTaskInfo = mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT);
final ComponentName homeComponent =
if (!ActivityManagerWrapper.isHomeTask(runningTaskInfo)) {
final ComponentName homeComponent =
mOverviewComponentObserver.getHomeIntent().getComponent();
forceOverviewInputConsumer =
forceOverviewInputConsumer =
runningTaskInfo.baseIntent.getComponent().equals(homeComponent);
}
}
if (runningTaskInfo == null && !sSwipeSharedState.goingToLauncher