From 86b57551785b7989c91b82a8b5327cad2aa90317 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Mon, 8 Apr 2024 15:36:31 -0700 Subject: [PATCH] Reset allAppsVisible if folding to phone upon recreateTaskbar. For taskbar unification, we should reset this bit to false when folding into phone orientation. Otherwise, we will reinit Taskbar AllApps over the phone UI which is unexpected behavior. Test: Manual Flag: N/A Fix: 293379641 Change-Id: I53c38c8b4df477191be3c21b7750c55a71c7336f (cherry picked from commit 6d63e7796dacadd60bbe1d7a667f0f728decd383) Merged-In: I53c38c8b4df477191be3c21b7750c55a71c7336f --- .../src/com/android/launcher3/taskbar/TaskbarManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index ecbc7e7fdc..65979b4ddc 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -473,8 +473,8 @@ public class TaskbarManager { LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) : null; // All Apps action is unrelated to navbar unification, so we only need to check DP. - mAllAppsActionManager.setTaskbarPresent(dp != null && dp.isTaskbarPresent); - + final boolean isLargeScreenTaskbar = dp != null && dp.isTaskbarPresent; + mAllAppsActionManager.setTaskbarPresent(isLargeScreenTaskbar); destroyExistingTaskbar(); boolean isTaskbarEnabled = dp != null && isTaskbarEnabled(dp); @@ -497,6 +497,7 @@ public class TaskbarManager { } mSharedState.startTaskbarVariantIsTransient = DisplayController.isTransientTaskbar(mTaskbarActivityContext); + mSharedState.allAppsVisible = mSharedState.allAppsVisible && isLargeScreenTaskbar; mTaskbarActivityContext.init(mSharedState); if (mActivity != null) {