openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add more restrictions on whether we increase the hotseat size for tall devices. 

Bug: 194688362
Test: test devices that should not be affected, ensure they are not affected
Change-Id: I0e027354dbafcce30cf616998d2a7bfab516b5de
This commit is contained in:
Jon Miranda 2021-07-28 14:14:59 -07:00
parent 0a5b66af2c
commit 80dda30f49
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/launcher3/DeviceProfile.java
View File

@ -91,6 +91,8 @@ public class DeviceProfile {
private static final float TALL_DEVICE_ASPECT_RATIO_THRESHOLD = 2.0f; private static final float TALL_DEVICE_ASPECT_RATIO_THRESHOLD = 2.0f;
private static final float TALLER_DEVICE_ASPECT_RATIO_THRESHOLD = 2.15f; private static final float TALLER_DEVICE_ASPECT_RATIO_THRESHOLD = 2.15f;
private static final float TALL_DEVICE_EXTRA_SPACE_THRESHOLD_DP = 252;
private static final float TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP = 268;
// To evenly space the icons, increase the left/right margins for tablets in portrait mode. // To evenly space the icons, increase the left/right margins for tablets in portrait mode.
private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4; private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;
@ -377,11 +379,17 @@ public class DeviceProfile {
} else if (!isVerticalBarLayout() && isPhone && isTallDevice) { } else if (!isVerticalBarLayout() && isPhone && isTallDevice) {
// We increase the hotseat size when there is extra space. // We increase the hotseat size when there is extra space.
if (Float.compare(aspectRatio, TALLER_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0) { if (Float.compare(aspectRatio, TALLER_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0
// For taller devices, we will take a third of the extra space from each row, && extraSpace >= Utilities.dpToPx(TALL_DEVICE_EXTRA_SPACE_THRESHOLD_DP)) {
// For taller devices, we will take a piece of the extra space from each row,
// and add it to the space above and below the hotseat. // and add it to the space above and below the hotseat.
// For devices with more extra space, we take a larger piece from each cell.
int piece = extraSpace < Utilities.dpToPx(TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP)
? 5 : 3;
int extraSpace = ((getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2) int extraSpace = ((getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2)
* inv.numRows) / 3; * inv.numRows) / piece;
int halfExtraSpace = extraSpace / 2; int halfExtraSpace = extraSpace / 2;
hotseatBarTopPaddingPx += halfExtraSpace; hotseatBarTopPaddingPx += halfExtraSpace;