commit a06576bc363eba292f547dca077989f8f7ec671c
author Alex Chau <alexchau@google.com> Tue Jan 24 17:38:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 24 17:38:51 2023 +0000
tree 09a85c38ebe020700ea4169ed47e4ec0344bd5d0
parent 329a47dd8fb63af806f0ddfc36f5e835b8b9e8b3
parent 1103195e42d011317a840b6d22719307a6191ed7

Merge "Destroy taskbar if it's not present in DeviceProfile" into tm-qpr-dev am: 1103195e42

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21060664

Change-Id: I35f6f8a8773a60e358bf68bbcb7b93d7467d03c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 98c45d5..a58906f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -156,10 +156,14 @@
                 } else {
                     // Config change might be handled without re-creating the taskbar
                     if (mTaskbarActivityContext != null) {
-                        if (dp != null && isTaskbarPresent(dp)) {
-                            mTaskbarActivityContext.updateDeviceProfile(dp, mNavMode);
+                        if (dp != null && !isTaskbarPresent(dp)) {
+                            destroyExistingTaskbar();
+                        } else {
+                            if (dp != null && isTaskbarPresent(dp)) {
+                                mTaskbarActivityContext.updateDeviceProfile(dp, mNavMode);
+                            }
+                            mTaskbarActivityContext.onConfigurationChanged(configDiff);
                         }
-                        mTaskbarActivityContext.onConfigurationChanged(configDiff);
                     }
                 }
                 mOldConfig = newConfig;