commit 58a018746d1657f707310a72811f146af33990b6
author Tracy Zhou <tracyzhou@google.com> Sun Apr 28 22:51:34 2024 -0700
committer Tracy Zhou <tracyzhou@google.com> Wed May 01 00:08:47 2024 +0000
tree fa564930010c722ea56caf26723d68ad65134f50
parent 747e3fd94908e442ed49095897e7bc02e4d27c08

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
(cherry picked from commit ee67a48d600cb68d01dd9731e1a4990944d335b2)

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
index 7e74c27..a6988ee 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
@@ -321,8 +321,7 @@
         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);
@@ -358,6 +357,7 @@
         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());
     }