commit 40f8d3c3e0d736f35ba63616f8b5b3df1572d2be
author Jonathan Miranda <jonmiranda@google.com> Fri Jul 23 21:28:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 23 21:28:19 2021 +0000
tree 8d5e38228f3526fc765a4b8fac48c7882ec2fe9c
parent 46c2d41c79fad4d106a31d112865e2f8f0485934
parent 374336a571518b120a38ce062828db8caac52e4c

Merge "Update hotseat sizing for 4x5 grids."

res/xml/size_limits_80x104.xml

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

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index c960366..1947d48 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -830,11 +830,11 @@
                 ? workspacePadding.bottom
                 : hotseatBarSizePx - hotseatCellHeightPx - hotseatQsbHeight;
 
-        if (isScalableGrid) {
+        if (isScalableGrid && qsbBottomMarginPx > mInsets.bottom) {
             return Math.min(qsbBottomMarginPx, freeSpace);
         }  else {
             return (int) (freeSpace * QSB_CENTER_FACTOR)
-                + (isTaskbarPresent ? taskbarSize : getInsets().bottom);
+                + (isTaskbarPresent ? taskbarSize : mInsets.bottom);
         }
     }