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>
This commit is contained in:
Alex Chau
2023-01-24 17:38:51 +00:00
committed by Automerger Merge Worker

View File

@@ -156,10 +156,14 @@ public class TaskbarManager {
} 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;