Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d8ce96 authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Consider padding when measuring AllApps in SecondaryDragLayer" into tm-dev am: 69230bbb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18349768



Change-Id: Ifdfb49d3806fb80400b21a07473cfd86b7e482dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a4409f9 69230bbb

src/com/android/launcher3/secondarydisplay/SecondaryDragLayer.java

+2 −5
Original line number Diff line number Diff line
@@ -120,23 +120,20 @@ public class SecondaryDragLayer extends BaseDragLayer<SecondaryDisplayLauncher> 


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

            }