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

Commit d74f7e73 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev am: 72ce9916" into nyc-mr1-dev
parents 4d46efc0 d748b546

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.