Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev am: 22d263a080

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17136843

Change-Id: I0d14537f2b3521a445496daad3bec66d2fdb8f09
This commit is contained in:
TreeHugger Robot
2022-03-09 16:40:20 +00:00
committed by Automerger Merge Worker
+7 -2
View File
@@ -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;
// Whether QSB might be inline in appropriate orientation (landscape).
boolean canQsbInline = isLargeTablet && hotseatQsbHeight > 0;
isQsbInline = canQsbInline && isLandscape;
if (isTaskbarPresent && !isGestureMode && isQsbInline) {
// 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 =