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

Commit 47153d72 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-866a059a-f7fc-4082-9b78-f35b177cf256' into ub-launcher3-master 

* changes:
  separate enforceContainerWithinScreen logic to a private method am: 27790352 am: 6dc62fb2
  separate enforceContainerWithinScreen logic to a private method am: 27790352
  separate enforceContainerWithinScreen logic to a private method
parents 0e5e5871 2a3998ba

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

+7 −2
Original line number Diff line number Diff line
@@ -402,9 +402,14 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra 
    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {

        super.onLayout(changed, l, t, r, b);

        enforceContainedWithinScreen(l, r);



    }



    private void enforceContainedWithinScreen(int left, int right) {

        DragLayer dragLayer = mLauncher.getDragLayer();

        if (getTranslationX() + l < 0 ||

                getTranslationX() + l + getMeasuredWidth() > dragLayer.getWidth()) {

        if (getTranslationX() + left < 0 ||

                getTranslationX() + right > dragLayer.getWidth()) {

            // If we are still off screen, center horizontally too.

            mGravity |= Gravity.CENTER_HORIZONTAL;

        }