commit 1103195e42d011317a840b6d22719307a6191ed7
author Alex Chau <alexchau@google.com> Tue Jan 24 17:35:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 24 17:35:37 2023 +0000
tree 453d2f68fe7207a4a2084213a9e57fa418c8c9dd
parent 74471716ca6a7c1015c2997406d87f2732b5a03a
parent 2d9692f63dbb808bf5044a4c090f8482e4cd3651

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

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;