commit 76263c2d35ecccea968f8cafb0e5799922432ef5
author Luca Zuccarini <acul@google.com> Tue Mar 01 10:21:36 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 01 10:21:36 2022 +0000
tree 34083d694eb2026bc28a7cd786bb6ea893631cd0
parent 33b858d4cc8c12c6c1900a24859b537cd7589e79
parent 5c65febbb61415c2e17654788120020b4183ced2

Merge "Ensure that the Hotseat respects the margins of the QSB." into tm-dev

src/com/android/launcher3/Hotseat.java

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index cb0cc11..e1680fc 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -173,9 +173,15 @@
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
-        int width = mActivity.getDeviceProfile().isQsbInline
-                ? mActivity.getDeviceProfile().qsbWidth
-                : getShortcutsAndWidgets().getMeasuredWidth();
+        int width;
+        if (mActivity.getDeviceProfile().isQsbInline) {
+            width = mActivity.getDeviceProfile().qsbWidth;
+        } else {
+            MarginLayoutParams qsbParams = (MarginLayoutParams) mQsb.getLayoutParams();
+            width = getShortcutsAndWidgets().getMeasuredWidth()
+                    - qsbParams.getMarginStart()
+                    - qsbParams.getMarginEnd();
+        }
 
         mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));