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

Commit a8b8de1f authored by Pat Manning's avatar Pat Manning Committed by Automerger Merge Worker
Browse files

Bound drop target layout values to left and right. am: 3c0f4c15 am: 781c68b2 

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



Change-Id: I14acd17e473d0f2a081a90e41bfb1598f21c49d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6df6eda 781c68b2

src/com/android/launcher3/DropTargetBar.java

+14 −6
Original line number Diff line number Diff line
@@ -285,13 +285,21 @@ public class DropTargetBar extends FrameLayout 
                int buttonPlusGapWidth = leftButtonWidth + buttonGap + rightButtonWidth;



                int extraSpace = end - start - buttonPlusGapWidth;

                start = (start - left) + (extraSpace / 2);



                leftButton.layout(start, 0, start + leftButtonWidth,

                int leftBound = Math.max(left, 0);

                int rightBound = Math.min(right, dp.availableWidthPx);



                int leftButtonStart = Utilities.boundToRange(

                        (start - left) + (extraSpace / 2), leftBound, rightBound);

                int leftButtonEnd = Utilities.boundToRange(

                        leftButtonStart + leftButtonWidth, leftBound, rightBound);

                int rightButtonStart = Utilities.boundToRange(

                        leftButtonEnd + buttonGap, leftBound, rightBound);

                int rightButtonEnd = Utilities.boundToRange(

                        rightButtonStart + rightButtonWidth, leftBound, rightBound);



                leftButton.layout(leftButtonStart, 0, leftButtonEnd,

                        leftButton.getMeasuredHeight());



                int rightButtonStart = start + leftButtonWidth + buttonGap;

                rightButton.layout(rightButtonStart, 0, rightButtonStart + rightButtonWidth,

                rightButton.layout(rightButtonStart, 0, rightButtonEnd,

                        rightButton.getMeasuredHeight());

            }

        }