Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev (72ce9916) · Commits · e / os / android_frameworks_base

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.