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

Commit 0e89e09f authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
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 am: 6ef0f122 am: 73f1fa59

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



Change-Id: Ic5872543739bb5dc680ca1d46d6a27967f03411d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1707e30 73f1fa59

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