From 9fdd7a1340c554d1672523d5776267da297b54e4 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Thu, 9 Mar 2023 13:41:21 +0000 Subject: [PATCH] Stash taskbar on swipe to go home for 3p fallback launcher. Fix: 269070986 Test: manual. Install launcher3WithoutQuickstepDebug and swipe to home from within an app. Change-Id: I1fe3d48793644d35271440e40dd028dd64e6d0cf --- .../taskbar/FallbackTaskbarUIController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java index c165750db8..9bcc80405d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java @@ -77,13 +77,14 @@ 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) { - boolean useStashedLauncherState = toState.hasOverviewActions(); - boolean stashedLauncherState = - useStashedLauncherState && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get() - && toState == RecentsState.MODAL_TASK; + // 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); 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).