commit 5c65febbb61415c2e17654788120020b4183ced2
author Luca Zuccarini <acul@google.com> Mon Feb 14 13:12:05 2022 +0000
committer Luca Zuccarini <acul@google.com> Fri Feb 25 17:00:07 2022 +0000
tree 2e808cdc619fa4a98ec2ee5640f769005a0d4fee
parent e479619836b1abf874ab25bdfb2402bf84ed0f56

Ensure that the Hotseat respects the margins of the QSB.

Before this change they were ignored by onMeasure(), so that the QSB
couldn't rely on margins for its positioning.

Bug: 217477426
Test: manual
Change-Id: Ifecd3d40ea584273b7857d19b25a90dbafe1c656
(cherry picked from commit 410c75a44276302d3ce1513cf09eba58a3d7bb88)

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));