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

Commit d9319683 authored by Brian Isganitis's avatar Brian Isganitis Committed by Automerger Merge Worker
Browse files

Merge "Prevent arrow popup from going off screen bottom when below icon." into... 

Merge "Prevent arrow popup from going off screen bottom when below icon." into tm-dev am: 65df4506

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



Change-Id: I25e8f81ce511d1847133f5559e2046393af22ec4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84bc0164 65df4506

src/com/android/launcher3/popup/ArrowPopup.java

+2 −1
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ public abstract class ArrowPopup<T extends Context & ActivityContext> 
        mIsAboveIcon = y > dragLayer.getTop() + insets.top;

        if (!mIsAboveIcon) {

            y = mTempRect.top + iconHeight + extraVerticalSpace;

            height -= extraVerticalSpace;

        }



        // Insets are added later, so subtract them now.
@@ -609,7 +610,7 @@ public abstract class ArrowPopup<T extends Context & ActivityContext> 
        y -= insets.top;



        mGravity = 0;

        if (y + height > dragLayer.getBottom() - insets.bottom) {

        if ((insets.top + y + height) > (dragLayer.getBottom() - insets.bottom)) {

            // The container is opening off the screen, so just center it in the drag layer instead.

            mGravity = Gravity.CENTER_VERTICAL;

            // Put the container next to the icon, preferring the right side in ltr (left in rtl).