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

Commit a0e0069c authored by Thales Lima's avatar Thales Lima Committed by Android (Google) Code Review
Browse files

Merge "Use transient taskbar check in split screen" into udc-qpr-dev

parents 2cd2e2da e9566407

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;