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

core/java/android/widget/PopupWindow.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1517,13 +1517,9 @@ public class PopupWindow {
	anchor.getWindowVisibleDisplayFrame(displayFrame);		anchor.getWindowVisibleDisplayFrame(displayFrame);
	if (width == MATCH_PARENT) {		if (width == MATCH_PARENT) {
	width = displayFrame.right - displayFrame.left;		width = displayFrame.right - displayFrame.left;
	} else if (width == WRAP_CONTENT) {
	width = mContentView.getMeasuredWidth();
	}		}
	if (height == MATCH_PARENT) {		if (height == MATCH_PARENT) {
	height = displayFrame.bottom - displayFrame.top;		height = displayFrame.bottom - displayFrame.top;
	} else if (height == WRAP_CONTENT) {
	height = mContentView.getMeasuredHeight();
	}		}

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