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

Commit a3875b85 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Ensure that popup width and height are correct on update" into nyc-dev 

am: 9e6fe190

* commit '9e6fe190':
  Ensure that popup width and height are correct on update
parents 5e1789f4 9e6fe190

core/java/android/widget/PopupWindow.java

+5 −2
Original line number Diff line number Diff line
@@ -2027,21 +2027,24 @@ public class PopupWindow { 
            mAnchorYoff = yoff;

        }



        final WindowManager.LayoutParams p =

                (WindowManager.LayoutParams) mDecorView.getLayoutParams();



        if (updateDimension) {

            if (width == -1) {

                width = mPopupWidth;

            } else {

                mPopupWidth = width;

                p.width = width;

            }

            if (height == -1) {

                height = mPopupHeight;

            } else {

                mPopupHeight = height;

                p.height  = height;

            }

        }



        final WindowManager.LayoutParams p =

                (WindowManager.LayoutParams) mDecorView.getLayoutParams();

        final int x = p.x;

        final int y = p.y;

        if (updateLocation) {