Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd54b27 authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Automerger Merge Worker
Browse files

Merge "Set taskbar heights to 0 when taskbar is not present." into udc-qpr-dev am: d295e351 

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



Change-Id: I264b4f4cc0ce92f3140759fb6d3305f9018caa6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c76ccfd d295e351

src/com/android/launcher3/DeviceProfile.java

+4 −1
Original line number Diff line number Diff line
@@ -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)