diff options
| author | James O'Leary <jamesoleary@google.com> | 2019-08-05 15:20:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 15:20:46 -0700 |
| commit | c714f1657b543668c0700b468a6f21a0119b81db (patch) | |
| tree | 36f9d243367db296235ebad00f9497e2e7ebaece /quickstep | |
| parent | ccf108c5f30e1c5c9251b2fd9d0a15811af53434 (diff) | |
| parent | 290a9a814a5b0ab0a1ab49cd268e29a79aec252e (diff) | |
| download | android_packages_apps_Trebuchet-c714f1657b543668c0700b468a6f21a0119b81db.tar.gz android_packages_apps_Trebuchet-c714f1657b543668c0700b468a6f21a0119b81db.tar.bz2 android_packages_apps_Trebuchet-c714f1657b543668c0700b468a6f21a0119b81db.zip | |
Merge "Fix inability to dismiss Assistant answer when launcher frontmost" into ub-launcher3-qt-r1-dev
am: 290a9a814a
Change-Id: I128fb662ea38a00f3a14734aae9c5c1bbb849b09
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index 98c550293..86ba85578 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -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 |