commit 8f16a7703ebdb333620ade6177c726b7395209be
author Jonathan Miranda <jonmiranda@google.com> Fri Jul 23 23:10:37 2021 +0000
committer Jonathan Miranda <jonmiranda@google.com> Fri Jul 23 23:13:44 2021 +0000
tree ff91223d9e15e1b4020bb5ae3001eea4e3f19e27
parent e7f9f3ee7c5f20213cc6ef04dd6ea60bc1c3bd45
parent 6d9e8666694eeffda9b1cc3d0945c18249ebe824

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

src/com/android/launcher3/DeviceProfile.java

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);
         }
     }