From f8da98a59bbf5505aaab960bd5f00c5d7c14f4e2 Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Fri, 15 Sep 2023 11:36:32 +0000 Subject: [PATCH] Set taskbar heights to 0 when taskbar is not present. Fix: 289769344 Test: DeviceProfileDumpTest Change-Id: I53f8a629c8adc12feb1fdf9f5b40b4a680c97b78 Merged-In: I53f8a629c8adc12feb1fdf9f5b40b4a680c97b78 --- src/com/android/launcher3/DeviceProfile.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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)