From 8e714d42aed4df42d2a4d90c74f28284cd172bdf Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Sun, 22 Mar 2020 13:11:29 -0700 Subject: [PATCH 1/2] Update launcher call to fetch recent tasks - Always just fetch the tasks that will end up in recents Bug: 152133859 Test: Manual, swipe up with pip/assistant and verify nothing changed Change-Id: I41719e111cba85da7e93f65681b7b50b4c5c4a46 --- .../quickstep/TouchInteractionService.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 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 25a307852d..fc1630c5b9 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -439,7 +439,7 @@ public class TouchInteractionService extends Service implements PluginListener mAM.getRunningTask(0))); + () -> mAM.getRunningTask(true /* filterOnlyVisibleRecents */))); if (mDeviceState.isInSwipeUpTouchRegion(event)) { mConsumer.onConsumerAboutToBeSwitched(); @@ -567,18 +567,10 @@ public class TouchInteractionService extends Service implements PluginListener mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT /* ignoreActivityType */))); - ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent(); - ComponentName runningComponent = - gestureState.getRunningTask().baseIntent.getComponent(); - forceOverviewInputConsumer = - runningComponent != null && runningComponent.equals(homeComponent); - } + RunningTaskInfo runningTask = gestureState.getRunningTask(); + ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent(); + boolean forceOverviewInputConsumer = runningTask != null + && runningTask.baseIntent.getComponent().equals(homeComponent); if (previousGestureState.getFinishingRecentsAnimationTaskId() > 0) { // If the finish animation was interrupted, then continue using the other activity input From e0ae1afd5189e8f5a58abdb8114562a2f067dca4 Mon Sep 17 00:00:00 2001 From: jayaprakashs Date: Mon, 16 Mar 2020 11:04:46 -0700 Subject: [PATCH 2/2] [DO NOT MERGE] Enable APP_SEARCH_IMPROVEMENTS flag. Bug: 151196870 Merged-In: I0665be5d585f64f3d43d42201a6529fd88247ca4 Change-Id: I0665be5d585f64f3d43d42201a6529fd88247ca4 (cherry picked from commit 6b6dbc3442c492d8e35fb4a2d0976b4fbc036dc9) --- src/com/android/launcher3/config/BaseFlags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index 2a3f5af75b..4b90e421ff 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -113,7 +113,7 @@ public abstract class BaseFlags { "Suggests folder names instead of blank text."); public static final TogglableFlag APP_SEARCH_IMPROVEMENTS = new TogglableFlag( - "APP_SEARCH_IMPROVEMENTS", false, + "APP_SEARCH_IMPROVEMENTS", true, "Adds localized title and keyword search and ranking"); public static final TogglableFlag ENABLE_PREDICTION_DISMISS = new TogglableFlag(