commit ee87fb8940c9bdf35fec4111fc05de88f96f99a7
author Tracy Zhou <tracyzhou@google.com> Tue Aug 20 22:38:06 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 20 22:38:06 2024 +0000
tree 3ef701f298aaed67fa3adc288154a05c731f4535
parent e4262972ccbfb9f90f10e24fe890f472bd820372
parent a54e490eb1bacf139b9301644f480ae3dd981691

Merge "notifyTaskbarStatus in taskbar phone mode" into main

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index f411e79..8c87fa6 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -459,10 +459,12 @@
                 + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null)
                 + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION
                 + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent));
-            if (!isTaskbarEnabled) {
+            if (!isTaskbarEnabled || !isLargeScreenTaskbar) {
                 SystemUiProxy.INSTANCE.get(mContext)
                     .notifyTaskbarStatus(/* visible */ false, /* stashed */ false);
-                return;
+                if (!isTaskbarEnabled) {
+                    return;
+                }
             }
 
             if (enableTaskbarNoRecreate() || mTaskbarActivityContext == null) {