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

Commit 6187ecc1 authored by Helen Cheuk's avatar Helen Cheuk Committed by Android (Google) Code Review
Browse files

Merge "Pad large screen hotseat in RTL 3 button nav mode by swapping left and... 

Merge "Pad large screen hotseat in RTL 3 button nav mode by swapping left and right padding to avoid overlapping with nav buttons" into tm-qpr-dev
parents b26e558c e76291f5

src/com/android/launcher3/DeviceProfile.java

+15 −9
Original line number Diff line number Diff line
@@ -1315,23 +1315,29 @@ public class DeviceProfile { 
                    hotseatBarSizePx - hotseatBarBottomPadding - hotseatCellHeightPx;



            int hotseatWidth = getHotseatRequiredWidth();

            int leftSpacing = (availableWidthPx - hotseatWidth) / 2;

            int rightSpacing = leftSpacing;

            int startSpacing;

            int endSpacing;

            // Hotseat aligns to the left with nav buttons

            if (hotseatBarEndOffset > 0) {

                leftSpacing = inlineNavButtonsEndSpacing;

                rightSpacing = availableWidthPx - hotseatWidth - leftSpacing + hotseatBorderSpace;

                startSpacing = inlineNavButtonsEndSpacing;

                endSpacing = availableWidthPx - hotseatWidth - startSpacing + hotseatBorderSpace;

            } else {

                startSpacing = (availableWidthPx - hotseatWidth) / 2;

                endSpacing = startSpacing;

            }

            startSpacing += getAdditionalQsbSpace();



            hotseatBarPadding.set(leftSpacing, hotseatBarTopPadding, rightSpacing,

                    hotseatBarBottomPadding);



            hotseatBarPadding.top = hotseatBarTopPadding;

            hotseatBarPadding.bottom = hotseatBarBottomPadding;

            boolean isRtl = Utilities.isRtl(context.getResources());

            if (isRtl) {

                hotseatBarPadding.right += getAdditionalQsbSpace();

                hotseatBarPadding.left = endSpacing;

                hotseatBarPadding.right = startSpacing;

            } else {

                hotseatBarPadding.left += getAdditionalQsbSpace();

                hotseatBarPadding.left = startSpacing;

                hotseatBarPadding.right = endSpacing;

            }



        } else if (isScalableGrid) {

            int sideSpacing = (availableWidthPx - hotseatQsbWidth) / 2;

            hotseatBarPadding.set(sideSpacing,