Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 72ce991692

Change-Id: Id020f8282da4b13da91921c459b1b65d6fa8552d
This commit is contained in:
Robert Carr
2016-06-21 21:30:53 +00:00
committed by android-build-merger
parent 072ce0c29c 72ce991692
commit 5a35355364
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/PopupWindow.java
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.