summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwais Ashraf <uwaisashraf@google.com>2023-09-15 11:36:32 +0000
committerUwais Ashraf <uwaisashraf@google.com>2023-09-15 19:37:10 +0000
commitf8da98a59bbf5505aaab960bd5f00c5d7c14f4e2 (patch)
treec6c838fb53fd2b44456852fe4283e2d6d45f1a36
parent4c053e5f6b401b30a932c3ce164ff884aca1260a (diff)
downloadLauncher3-f8da98a59bbf5505aaab960bd5f00c5d7c14f4e2.tar.gz
Set taskbar heights to 0 when taskbar is not present.
Fix: 289769344 Test: DeviceProfileDumpTest Change-Id: I53f8a629c8adc12feb1fdf9f5b40b4a680c97b78 Merged-In: I53f8a629c8adc12feb1fdf9f5b40b4a680c97b78
-rw-r--r--src/com/android/launcher3/DeviceProfile.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index be43e6ca4f..936229ab29 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -363,7 +363,10 @@ public class DeviceProfile {
}
isTransientTaskbar = DisplayController.isTransientTaskbar(context);
- if (isTransientTaskbar) {
+ if (!isTaskbarPresent) {
+ taskbarIconSize = taskbarHeight = stashedTaskbarHeight = taskbarBottomMargin = 0;
+ startAlignTaskbar = false;
+ } else if (isTransientTaskbar) {
float invTransientIconSizeDp = inv.transientTaskbarIconSize[mTypeIndex];
taskbarIconSize = pxFromDp(invTransientIconSizeDp, mMetrics);
taskbarHeight = Math.round((taskbarIconSize * ICON_VISIBLE_AREA_FACTOR)