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

This commit is contained in:
TreeHugger Robot
2016-06-21 21:23:57 +00:00
committed by Android (Google) Code Review

View File

@@ -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.