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

Commit 6ef0f122 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Use transient taskbar size/margin to calculate taskbar position for... 

Merge "Use transient taskbar size/margin to calculate taskbar position for persistent taskbar" into tm-qpr-dev
parents 48651b21 85d664ef

src/com/android/launcher3/DeviceProfile.java

+5 −4
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ public class DeviceProfile { 
    // Whether Taskbar will inset the bottom of apps by taskbarSize.

    public boolean isTaskbarPresentInApps;

    public int taskbarSize;

    public int transientTaskbarSize;

    public int stashedTaskbarSize;

    public int transientTaskbarMargin;
@@ -324,12 +325,12 @@ public class DeviceProfile { 
        }



        if (isTaskbarPresent) {

            transientTaskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);

            transientTaskbarMargin = res.getDimensionPixelSize(R.dimen.transient_taskbar_margin);

            if (DisplayController.isTransientTaskbar(context)) {

                taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);

                taskbarSize = transientTaskbarSize;

                stashedTaskbarSize =

                        res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size);

                transientTaskbarMargin =

                        res.getDimensionPixelSize(R.dimen.transient_taskbar_margin);

            } else {

                taskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_size);

                stashedTaskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_stashed_size);
@@ -1383,7 +1384,7 @@ public class DeviceProfile { 
    public int getOverviewActionsClaimedSpaceBelow() {

        if (isTaskbarPresent) {

            if (FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {

                return taskbarSize + transientTaskbarMargin * 2;

                return transientTaskbarSize + transientTaskbarMargin * 2;

            }



            return isGestureMode