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

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

Merge \\\"Don\\\'t try and resolve WRAP_CONTENT too early.\\\" into nyc-dev... 

Merge \\\"Don\\\'t try and resolve WRAP_CONTENT too early.\\\" into nyc-dev am: 72ce9916 am: 5a353553
am: b964f26d

Change-Id: I45539980837dec09d0cde9fd84d256531ed1ebdc
parents c502ca33 b964f26d

core/java/android/widget/PopupWindow.java

+0 −4
Original line number Diff line number Diff line
@@ -1517,13 +1517,9 @@ public class PopupWindow { 
        anchor.getWindowVisibleDisplayFrame(displayFrame);

        if (width == MATCH_PARENT) {

            width = displayFrame.right - displayFrame.left;

        } else if (width == WRAP_CONTENT) {

            width = mContentView.getMeasuredWidth();

        }

        if (height == MATCH_PARENT) {

            height = displayFrame.bottom - displayFrame.top;

        } else if (height == WRAP_CONTENT) {

            height = mContentView.getMeasuredHeight();

        }



        // Let the window manager know to align the top to y.