commit 2017ee02084b19599a5d0db5db145017cea24ba5
author Thales Lima <tsuharesu@google.com> Mon Mar 21 14:30:19 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 21 14:30:19 2022 +0000
tree 37049a5fcffb7f064bfed6d443642b3337ffe6f9
parent af6641414ca20b637114b898edb2abbecbc252dd
parent 2903a624ce516810a71bb661311a5b1ebc1a942a

Merge "Correct inline qsb for foldables" into tm-dev

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 0e9b5da..09affd7 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -490,8 +490,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;