resolve merge conflicts of 6d9e8666694eeffda9b1cc3d0945c18249ebe824 to sc-v2-dev
Add more extra space to hotseat for taller devices.
Bug: 194533368
Bug: 192520231
Change-Id: Ib4705342329767a3e4eb2781aff6cd72220e4eaa
Test: manual test on taller devices
diff --git a/res/xml/size_limits_80x104.xml b/res/xml/size_limits_80x104.xml
index 93d43fb..4178664 100644
--- a/res/xml/size_limits_80x104.xml
+++ b/res/xml/size_limits_80x104.xml
@@ -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
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 78c0ded..94e98db 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -848,11 +848,11 @@
? workspacePadding.bottom
: hotseatBarSizePx - hotseatCellHeightPx - hotseatQsbHeight;
- if (isScalableGrid) {
+ if (isScalableGrid && qsbBottomMarginPx > mInsets.bottom) {
return Math.min(qsbBottomMarginPx, freeSpace);
- } else {
+ } else {
return (int) (freeSpace * QSB_CENTER_FACTOR)
- + (isTaskbarPresent ? taskbarSize : getInsets().bottom);
+ + (isTaskbarPresent ? taskbarSize : mInsets.bottom);
}
}