From 9b5548c56db234963b6c07dc48495e8ef05ae0e7 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Fri, 13 May 2022 12:02:06 +0100 Subject: [PATCH] Consider padding when measuring AllApps in SecondaryDragLayer Fix: 223595498 Test: adb shell am start -a android.intent.action.MAIN -c android.intent.category.SECONDARY_HOME Change-Id: I2754eb08daf2657e502a22bf7308561f5d0c9a7f --- .../launcher3/secondarydisplay/SecondaryDragLayer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java index e906c951db..c79d70dacc 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java @@ -120,23 +120,20 @@ public class SecondaryDragLayer extends BaseDragLayer int maxWidth = grid.allAppsCellWidthPx * grid.numShownAllAppsColumns + horizontalPadding; - int appsWidth = Math.min(width, maxWidth); + int appsWidth = Math.min(width - getPaddingLeft() - getPaddingRight(), maxWidth); int maxHeight = grid.allAppsCellHeightPx * grid.numShownAllAppsColumns + verticalPadding; - int appsHeight = Math.min(height, maxHeight); + int appsHeight = Math.min(height - getPaddingTop() - getPaddingBottom(), maxHeight); mAppsView.measure( makeMeasureSpec(appsWidth, EXACTLY), makeMeasureSpec(appsHeight, EXACTLY)); - } else if (child == mAllAppsButton) { int appsButtonSpec = makeMeasureSpec(grid.iconSizePx, EXACTLY); mAllAppsButton.measure(appsButtonSpec, appsButtonSpec); - } else if (child == mWorkspace) { measureChildWithMargins(mWorkspace, widthMeasureSpec, 0, heightMeasureSpec, grid.iconSizePx + grid.edgeMarginPx); - } else { measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0); }