commit 2903a624ce516810a71bb661311a5b1ebc1a942a
author Thales Lima <tsuharesu@google.com> Thu Mar 17 13:52:19 2022 +0000
committer Thales Lima <tsuharesu@google.com> Thu Mar 17 13:52:19 2022 +0000
tree 152448cb5521b8e66799a894e663c195540df0e2
parent 025bf08e2fec6fdc4e6fc7b03223864a6a9b0758

Correct inline qsb for foldables

Fixes 223565967
Test: manual and HSV

Change-Id: I40ef17142f90a8b29cdec44a36249eb2b800734a

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 622d750..458969a 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -489,8 +489,10 @@
     }
 
     private int calculateQsbWidth() {
-        return cellWidthPx * inv.numColumns
-                + cellLayoutBorderSpacePx.x * (inv.numColumns - 1)
+        int columns = isTwoPanels ? inv.numColumns * 2 : inv.numColumns;
+
+        return cellWidthPx * columns
+                + cellLayoutBorderSpacePx.x * (columns - 1)
                 - (cellWidthPx - iconSizePx) // left and right cell space
                 - iconSizePx * numShownHotseatIcons
                 - hotseatBorderSpace * numShownHotseatIcons;