Merge "notifyTaskbarStatus in taskbar phone mode" into main

2024-08-20 22:38:06 +00:00
parent e4262972cc a54e490eb1
commit ee87fb8940
1 changed files with 4 additions and 2 deletions
@@ -459,10 +459,12 @@ public class TaskbarManager {
                + " [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) {