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

Merge "Update hotseat sizing for 4x5 grids." into sc-dev

This commit is contained in:
TreeHugger Robot 2021-07-23 22:39:48 +00:00 committed by Android (Google) Code Review
parent e0e64b4851 069f8c5ac9
commit 6d9e866669
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/size_limits_80x104.xml
View File

@ -80,10 +80,10 @@
launcher:b="16dp"/>
<workspaceBottomPadding
launcher:a="1"
launcher:c="52dp"/>
launcher:c="72dp"/>
<hotseatBottomPadding
launcher:a="0"
launcher:b="36dp"/>
launcher:b="56dp"/>
</device-padding>
<device-padding
@ -93,10 +93,10 @@
launcher:b="39dp"/>
<workspaceBottomPadding
launcher:a="1"
launcher:c="75dp"/>
launcher:c="95dp"/>
<hotseatBottomPadding
launcher:a="0"
launcher:b="36dp"/>
launcher:b="56dp"/>
</device-padding>
<device-padding

2
src/com/android/launcher3/Hotseat.java
View File

@ -207,7 +207,7 @@ public class Hotseat extends CellLayout implements Insettable {
? dp.workspacePadding.bottom
: dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;
if (dp.isScalableGrid) {
if (dp.isScalableGrid && dp.qsbBottomMarginPx > dp.getInsets().bottom) {
return Math.min(dp.qsbBottomMarginPx, freeSpace);
} else {
return (int) (freeSpace * QSB_CENTER_FACTOR) + (dp.isTaskbarPresent