From f0c7fa20ca0fca741ecbd36996518d80cce8c652 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Thu, 16 Mar 2023 15:53:53 +0000 Subject: [PATCH] Revert "Stash taskbar on swipe to go home for 3p fallback launcher." This reverts commit 9fdd7a1340c554d1672523d5776267da297b54e4. Reason for revert: testing for b/273809618 Change-Id: Icd0b862f1f5a5a9930a08774c339f21e740d2fa0 --- .../taskbar/FallbackTaskbarUIController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java index 9bcc80405d..c165750db8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java @@ -77,14 +77,13 @@ public class FallbackTaskbarUIController extends TaskbarUIController { /** * Creates an animation to animate the taskbar for the given state (but does not start it). + * Currently this animation just force stashes the taskbar in Overview. */ public Animator createAnimToRecentsState(RecentsState toState, long duration) { - // Force stash the taskbar in overview modal state or when going home. - boolean useStashedLauncherState = - toState.hasOverviewActions() || toState == RecentsState.HOME; - boolean stashedLauncherState = useStashedLauncherState && ( - (FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get() && toState == RecentsState.MODAL_TASK) - || toState == RecentsState.HOME); + boolean useStashedLauncherState = toState.hasOverviewActions(); + boolean stashedLauncherState = + useStashedLauncherState && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get() + && toState == RecentsState.MODAL_TASK; TaskbarStashController stashController = mControllers.taskbarStashController; // Set both FLAG_IN_STASHED_LAUNCHER_STATE and FLAG_IN_APP to ensure the state is respected. // For all other states, just use the current stashed-in-app setting (e.g. if long clicked).