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

Commit 07421cb9 authored by Robert Carr's avatar Robert Carr
Browse files

Don't try and resolve WRAP_CONTENT too early. 

At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.

Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152
parent f6e3c9a5

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.