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

Merge "Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev am: 72ce991692" into nyc-mr1-dev

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-21 23:37:11 +00:00
committed by Android (Google) Code Review
parent 4d46efc084 d748b54615
commit d74f7e7362
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.