From 2903a624ce516810a71bb661311a5b1ebc1a942a Mon Sep 17 00:00:00 2001
From: Thales Lima <tsuharesu@google.com>
Date: Thu, 17 Mar 2022 13:52:19 +0000
Subject: [PATCH] Correct inline qsb for foldables

Fixes 223565967
Test: manual and HSV

Change-Id: I40ef17142f90a8b29cdec44a36249eb2b800734a
---
 src/com/android/launcher3/DeviceProfile.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 622d750c83..458969a906 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -489,8 +489,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;