Merge "Correct inline qsb for foldables" into tm-dev am: 2017ee0208

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17236874 Change-Id: Ifbebb9932200dc178dfed841e918f439aff38b36
2022-03-21 14:40:51 +00:00
parent 5259e7bcff 2017ee0208
commit 9b7197f8b7
1 changed files with 4 additions and 2 deletions
@@ -490,8 +490,10 @@ public class DeviceProfile {
    }

    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;