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

Commit e9566407 authored by Thales Lima's avatar Thales Lima
Browse files

Use transient taskbar check in split screen 

The space that should be removed in split screen should check if there is a taskbar or not. Adding the transient taskbar property to DeviceProfile solves that without having to pass context around.

Fix: 289769344
Test: manual
Flag: N/A
Change-Id: Id0c51c4ec9481d3c206eef52d44094ec7a8c98cf
parent 90e2a4d2

src/com/android/launcher3/DeviceProfile.java

+3 −1
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ public class DeviceProfile { 
    public final int taskbarIconSize;

    // If true, used to layout taskbar in 3 button navigation mode.

    public final boolean startAlignTaskbar;

    public final boolean isTransientTaskbar;



    // DragController

    public int flingToDeleteThresholdVelocity;
@@ -361,7 +362,8 @@ public class DeviceProfile { 
            }

        }



        if (DisplayController.isTransientTaskbar(context)) {

        isTransientTaskbar = DisplayController.isTransientTaskbar(context);

        if (isTransientTaskbar) {

            float invTransientIconSizeDp = inv.transientTaskbarIconSize[mTypeIndex];

            taskbarIconSize = pxFromDp(invTransientIconSizeDp, mMetrics);

            taskbarHeight = Math.round((taskbarIconSize * ICON_VISIBLE_AREA_FACTOR)

src/com/android/launcher3/touch/PortraitPagedViewHandler.java

+4 −2
Original line number Diff line number Diff line
@@ -582,7 +582,8 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
                ? splitInfo.dividerHeightPercent

                : splitInfo.dividerWidthPercent;



        float scale = (float) outRect.height() / dp.availableHeightPx;

        int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight;

        float scale = (float) outRect.height() / (dp.availableHeightPx - taskbarHeight);

        float topTaskHeight = dp.availableHeightPx * topLeftTaskPercent;

        float scaledTopTaskHeight = topTaskHeight * scale;

        float dividerHeight = dp.availableHeightPx * dividerBarPercent;
@@ -639,7 +640,8 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
            // Reset unused translations

            primarySnapshot.setTranslationY(0);

        } else {

            float scale = (float) totalThumbnailHeight / dp.availableHeightPx;

            int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight;

            float scale = (float) totalThumbnailHeight / (dp.availableHeightPx - taskbarHeight);

            float topTaskHeight = dp.availableHeightPx * taskPercent;

            float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale);

            float scaledTopTaskHeight = topTaskHeight * scale;