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

Merge "PopupWindow. Don't use -1 width/height for calculations." into nyc-dev

Browse Source
This commit is contained in:
Rob Carr
2016-04-14 19:28:41 +00:00
committed by Android (Google) Code Review
parent 0d723a2a4d f6e801da1a
commit 446b4e727d
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/widget/PopupWindow.java
View File

@@ -1512,6 +1512,24 @@ public class PopupWindow {
outParams.x = drawingLocation[0] + xOffset; outParams.x = drawingLocation[0] + xOffset;
outParams.y = drawingLocation[1] + anchorHeight + yOffset; outParams.y = drawingLocation[1] + anchorHeight + yOffset;
// Let the window manager know to align the top to y.
outParams.gravity = Gravity.LEFT | Gravity.TOP;
outParams.width = width;
outParams.height = height;
// If width or height is unspecified. We can leave it to the window manager to match
// to the parent size, but for our local purposes of calculating positioning, we need
// to fill in real width and height values.
final Rect displayFrame = new Rect();
anchor.getWindowVisibleDisplayFrame(displayFrame);
if (width < 0) {
width = displayFrame.right - displayFrame.left;
}
if (height < 0) {
height = displayFrame.bottom - displayFrame.top;
}
// If we need to adjust for gravity RIGHT, align to the bottom-right // If we need to adjust for gravity RIGHT, align to the bottom-right
// corner of the anchor (still accounting for offsets). // corner of the anchor (still accounting for offsets).
final int hgrav = Gravity.getAbsoluteGravity(gravity, anchor.getLayoutDirection()) final int hgrav = Gravity.getAbsoluteGravity(gravity, anchor.getLayoutDirection())
@@ -1520,17 +1538,9 @@ public class PopupWindow {
outParams.x -= width - anchorWidth; outParams.x -= width - anchorWidth;
} }
// Let the window manager know to align the top to y.
outParams.gravity = Gravity.LEFT | Gravity.TOP;
outParams.width = width;
outParams.height = height;
final int[] screenLocation = mTmpScreenLocation; final int[] screenLocation = mTmpScreenLocation;
anchor.getLocationOnScreen(screenLocation); anchor.getLocationOnScreen(screenLocation);
final Rect displayFrame = new Rect();
anchor.getWindowVisibleDisplayFrame(displayFrame);
// First, attempt to fit the popup vertically without resizing. // First, attempt to fit the popup vertically without resizing.
final boolean fitsVertical = tryFitVertical(outParams, yOffset, height, final boolean fitsVertical = tryFitVertical(outParams, yOffset, height,
anchorHeight, drawingLocation[1], screenLocation[1], displayFrame.top, anchorHeight, drawingLocation[1], screenLocation[1], displayFrame.top,
@@ -2114,10 +2124,10 @@ public class PopupWindow {
// If an explicit width/height has not specified, use the most recent // If an explicit width/height has not specified, use the most recent
// explicitly specified value (either from setWidth/Height or update). // explicitly specified value (either from setWidth/Height or update).
if (width == -1) { if (width < 0) {
width = mWidth; width = mWidth;
} }
if (height == -1) { if (height < 0) {
height = mHeight; height = mHeight;
} }