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

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

Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev

parents 5c8ba15b 8175da96

src/com/android/launcher3/DeviceProfile.java

+8 −3
Original line number Diff line number Diff line
@@ -346,9 +346,14 @@ public class DeviceProfile { 
        workspaceCellPaddingXPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_padding_x);



        hotseatQsbHeight = res.getDimensionPixelSize(R.dimen.qsb_widget_height);

        isQsbInline = isLargeTablet && isLandscape && hotseatQsbHeight > 0;



        if (isTaskbarPresent && !isGestureMode && isQsbInline) {

        // Whether QSB might be inline in appropriate orientation (landscape).

        boolean canQsbInline = isLargeTablet && hotseatQsbHeight > 0;

        isQsbInline = canQsbInline && isLandscape;



        // We shrink hotseat sizes regardless of orientation, if nav buttons are inline and QSB

        // might be inline in either orientations, to keep hotseat size consistent across rotation.

        boolean areNavButtonsInline = isTaskbarPresent && !isGestureMode;

        if (areNavButtonsInline && canQsbInline) {

            numShownHotseatIcons = inv.numShrunkenHotseatIcons;

        } else {

            numShownHotseatIcons =