From ee67a48d600cb68d01dd9731e1a4990944d335b2 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Sun, 28 Apr 2024 22:51:34 -0700 Subject: [PATCH] Do not hide nav bar on the homescreen from setup FLAG_STASHED_SMALL_SCREEN is not updated after setup UI finishes. Fixes: 337738795 Test: Finish setup, swipe home in folded, and observe home handle is visible. Change-Id: I297e3b44f49f94ab5a1b9fe5ff16ff64c6cf2c0a --- .../com/android/launcher3/taskbar/TaskbarStashController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 2162a7319a..182ff7e898 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -319,8 +319,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba updateStateForFlag(FLAG_STASHED_IN_APP_AUTO, isStashedInAppAuto); updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, isInSetup); updateStateForFlag(FLAG_IN_SETUP, isInSetup); - updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, mActivity.isPhoneMode() - && !mActivity.isThreeButtonNav()); + updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, mActivity.isPhoneGestureNavMode()); // For now, assume we're in an app, since LauncherTaskbarUIController won't be able to tell // us that we're paused until a bit later. This avoids flickering upon recreating taskbar. updateStateForFlag(FLAG_IN_APP, true); @@ -356,6 +355,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba boolean hideTaskbar = isVisible || !mActivity.isUserSetupComplete(); updateStateForFlag(FLAG_IN_SETUP, hideTaskbar); updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, hideTaskbar); + updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, mActivity.isPhoneGestureNavMode()); applyState(hideTaskbar ? 0 : getStashDuration()); }