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

Commit 803f88b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Round split layout values instead of using int cast" into tm-qpr-dev

parents 8addaad1 8f54d597

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

+3 −3
Original line number Diff line number Diff line
@@ -504,9 +504,9 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { 
            DeviceProfile dp, boolean isRtl) {

        int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;

        int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;

        int dividerBar = splitBoundsConfig.appsStackedVertically

                ? (int) (splitBoundsConfig.dividerHeightPercent * parentHeight)

                : (int) (splitBoundsConfig.dividerWidthPercent * parentWidth);

        int dividerBar = Math.round(totalThumbnailHeight * (splitBoundsConfig.appsStackedVertically

                ? splitBoundsConfig.dividerHeightPercent

                : splitBoundsConfig.dividerWidthPercent));

        int primarySnapshotHeight;

        int primarySnapshotWidth;

        int secondarySnapshotHeight;

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

+3 −3
Original line number Diff line number Diff line
@@ -630,9 +630,9 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
            DeviceProfile dp, boolean isRtl) {

        int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;

        int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;

        int dividerBar = splitBoundsConfig.appsStackedVertically

                ? (int) (splitBoundsConfig.dividerHeightPercent * parentHeight)

                : (int) (splitBoundsConfig.dividerWidthPercent * parentWidth);

        int dividerBar = Math.round(splitBoundsConfig.appsStackedVertically

                ? splitBoundsConfig.dividerHeightPercent * totalThumbnailHeight

                : splitBoundsConfig.dividerWidthPercent * totalThumbnailHeight);

        int primarySnapshotHeight;

        int primarySnapshotWidth;

        int secondarySnapshotHeight;

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

+3 −3
Original line number Diff line number Diff line
@@ -283,9 +283,9 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { 
        // (portrait bottom) and secondary is on the right (portrait top)

        int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;

        int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;

        int dividerBar = splitBoundsConfig.appsStackedVertically

                ? (int) (splitBoundsConfig.dividerHeightPercent * parentHeight)

                : (int) (splitBoundsConfig.dividerWidthPercent * parentWidth);

        int dividerBar = Math.round(totalThumbnailHeight * (splitBoundsConfig.appsStackedVertically

                ? splitBoundsConfig.dividerHeightPercent

                : splitBoundsConfig.dividerWidthPercent));

        int primarySnapshotHeight;

        int primarySnapshotWidth;

        int secondarySnapshotHeight;