Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
22d263a080
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user