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

Commit a732ea6c authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

PopupWindow: Gravity fixes. 

am: 08516061

Change-Id: Ia9477ead7cf1cdd942817f2f427053c6187a1cdf
parents 3aab7f8a 08516061

core/java/android/widget/PopupWindow.java

+5 −7
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ public class PopupWindow { 


    private int mAnimationStyle = ANIMATION_STYLE_DEFAULT;



    private int mGravity = Gravity.NO_GRAVITY;



    private static final int[] ABOVE_ANCHOR_STATE_SET = new int[] {

        com.android.internal.R.attr.state_above_anchor

    };
@@ -1141,15 +1143,11 @@ public class PopupWindow { 


        mIsShowing = true;

        mIsDropdown = false;

        mGravity = gravity;



        final WindowManager.LayoutParams p = createPopupLayoutParams(token);

        preparePopup(p);



        // Only override the default if some gravity was specified.

        if (gravity != Gravity.NO_GRAVITY) {

            p.gravity = gravity;

        }



        p.x = x;

        p.y = y;
@@ -1394,8 +1392,8 @@ public class PopupWindow { 
    }



    private int computeGravity() {

        int gravity = Gravity.START | Gravity.TOP;

        if (mClipToScreen || mClippingEnabled) {

        int gravity = mGravity == Gravity.NO_GRAVITY ?  Gravity.START | Gravity.TOP : mGravity;

        if (mIsDropdown && (mClipToScreen || mClippingEnabled)) {

            gravity |= Gravity.DISPLAY_CLIP_VERTICAL;

        }

        return gravity;