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

Merge "Rewrite popup window positioning algorithm" into nyc-dev

Browse Source 
am: 9d8ec0f

* commit '9d8ec0f12ee67129afb4020aa1d91599073cfeab':
  Rewrite popup window positioning algorithm

Change-Id: I8e23de773a1a22278c17e8fb72d4f7b6da1c4921
This commit is contained in:
Alan Viverette
2016-04-05 16:35:35 +00:00
committed by android-build-merger
parent c5e036a67e 9d8ec0f12e
commit ec9af6f6b2
1 changed files with 139 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1495,7 +1495,7 @@ public class PopupWindow {
* *
* @param anchor the view on which the popup window must be anchored * @param anchor the view on which the popup window must be anchored
* @param outParams the layout parameters used to display the drop down * @param outParams the layout parameters used to display the drop down
* @param xOffset absolute horizontal offset from the top of the anchor * @param xOffset absolute horizontal offset from the left of the anchor
* @param yOffset absolute vertical offset from the top of the anchor * @param yOffset absolute vertical offset from the top of the anchor
* @param gravity horizontal gravity specifying popup alignment * @param gravity horizontal gravity specifying popup alignment
* @return true if the popup is translated upwards to fit on screen * @return true if the popup is translated upwards to fit on screen
@@ -1524,6 +1524,8 @@ public class PopupWindow {
// Let the window manager know to align the top to y. // Let the window manager know to align the top to y.
outParams.gravity = Gravity.LEFT | Gravity.TOP; 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);
@@ -1531,100 +1533,154 @@ public class PopupWindow {
final Rect displayFrame = new Rect(); final Rect displayFrame = new Rect();
anchor.getWindowVisibleDisplayFrame(displayFrame); anchor.getWindowVisibleDisplayFrame(displayFrame);
boolean onTop = false; // First, attempt to fit the popup vertically without resizing.
final boolean fitsVertical = tryFitVertical(outParams, yOffset, height,
anchorHeight, drawingLocation[1], screenLocation[1], displayFrame.top,
displayFrame.bottom, false);
final View root = anchor.getRootView(); // Next, attempt to fit the popup horizontally without resizing.
final int screenY = screenLocation[1] + anchorHeight + yOffset; final boolean fitsHorizontal = tryFitHorizontal(outParams, xOffset, width,
final boolean tooFarDown = screenY + height > displayFrame.bottom; anchorWidth, drawingLocation[0], screenLocation[0], displayFrame.left,
final boolean tooFarRight = outParams.x + width > root.getWidth(); displayFrame.right, false);
if (tooFarDown || tooFarRight) {
// If the popup extends beyond the visible area, try to scroll the
// parent so that it is fully visible.
if (mAllowScrollingAnchorParent) {
final int scrollX = anchor.getScrollX();
final int scrollY = anchor.getScrollY();
final Rect r = new Rect(scrollX, scrollY, scrollX + width + xOffset,
scrollY + height + anchorHeight + yOffset);
anchor.requestRectangleOnScreen(r, true);
}
// Update for the new anchor position. // If the popup still doesn't fit, attempt to scroll the parent.
anchor.getLocationInWindow(drawingLocation); if (!fitsVertical || !fitsHorizontal) {
outParams.x = drawingLocation[0] + xOffset; final int scrollX = anchor.getScrollX();
outParams.y = drawingLocation[1] + anchorHeight + yOffset; final int scrollY = anchor.getScrollY();
final Rect r = new Rect(scrollX, scrollY, scrollX + width + xOffset,
scrollY + height + anchorHeight + yOffset);
if (mAllowScrollingAnchorParent && anchor.requestRectangleOnScreen(r, true)) {
// Reset for the new anchor position.
anchor.getLocationInWindow(drawingLocation);
outParams.x = drawingLocation[0] + xOffset;
outParams.y = drawingLocation[1] + anchorHeight + yOffset;
// Preserve the gravity adjustment. // Preserve the gravity adjustment.
if (hgrav == Gravity.RIGHT) { if (hgrav == Gravity.RIGHT) {
outParams.x -= width - anchorWidth; outParams.x -= width - anchorWidth;
}
final int newScreenY = screenLocation[1] + anchorHeight + yOffset;
final boolean stillTooFarDown = newScreenY + height > displayFrame.bottom;
if (stillTooFarDown) {
// If the popup is still too far down, re-evaluate the space
// available and decide whether the pop-up will go above or
// below the anchor.
anchor.getLocationOnScreen(screenLocation);
final int below = displayFrame.bottom - screenLocation[1] - anchorHeight - yOffset;
final int above = screenLocation[1] - displayFrame.top + yOffset;
onTop = above > below;
if (onTop) {
// Move everything up.
if (mOverlapAnchor) {
yOffset += anchorHeight;
}
outParams.y = drawingLocation[1] - height + yOffset;
} }
} }
// Try to fit the popup again and allowing resizing.
tryFitVertical(outParams, yOffset, height, anchorHeight, drawingLocation[1],
screenLocation[1], displayFrame.top, displayFrame.bottom, mClipToScreen);
tryFitHorizontal(outParams, xOffset, width, anchorWidth, drawingLocation[0],
screenLocation[0], displayFrame.left, displayFrame.right, mClipToScreen);
} }
if (mClipToScreen) { // Return whether the popup's top edge is above the anchor's top edge.
// Use screen coordinates for comparison against display frame. return outParams.y < drawingLocation[1];
final int winOffsetX = screenLocation[0] - drawingLocation[0]; }
final int winOffsetY = screenLocation[1] - drawingLocation[1];
outParams.x += winOffsetX;
outParams.y += winOffsetY;
final int right = outParams.x + width; private boolean tryFitVertical(@NonNull LayoutParams outParams, int yOffset, int height,
if (right > displayFrame.right) { int anchorHeight, int drawingLocationY, int screenLocationY, int displayFrameTop,
// The popup is too far right, move it back in. int displayFrameBottom, boolean allowResize) {
outParams.x -= right - displayFrame.right; final int anchorTopInScreen = screenLocationY + anchorHeight + yOffset;
} final int spaceBelow = displayFrameBottom - anchorTopInScreen;
if (height <= spaceBelow) {
if (outParams.x < displayFrame.left) { return true;
// The popup is too far left, move it back in and clip if it's
// still too large.
outParams.x = displayFrame.left;
final int displayFrameWidth = displayFrame.width();
width = Math.min(width, displayFrameWidth);
}
final int bottom = outParams.y + height;
if (bottom > displayFrame.bottom) {
// The popup is too far down, move it back in.
outParams.y -= bottom - displayFrame.bottom;
}
if (outParams.y < displayFrame.top) {
// The popup is too far up, move it back in and clip if
// it's still too large.
outParams.y = displayFrame.top;
final int displayFrameHeight = displayFrame.height();
height = Math.min(height, displayFrameHeight);
}
outParams.x -= winOffsetX;
outParams.y -= winOffsetY;
} }
outParams.width = width; final int spaceAbove = displayFrameTop + anchorTopInScreen - anchorHeight;
if (height <= spaceAbove) {
// Move everything up.
if (mOverlapAnchor) {
yOffset += anchorHeight;
}
outParams.y = drawingLocationY - height + yOffset;
return true;
}
if (positionInDisplayVertical(outParams, height, drawingLocationY, screenLocationY,
displayFrameTop, displayFrameBottom, allowResize)) {
return true;
}
return false;
}
private boolean positionInDisplayVertical(@NonNull LayoutParams outParams, int height,
int drawingLocationY, int screenLocationY, int displayFrameTop, int displayFrameBottom,
boolean canResize) {
boolean fitsInDisplay = true;
final int winOffsetY = screenLocationY - drawingLocationY;
outParams.y += winOffsetY;
outParams.height = height; outParams.height = height;
return onTop; final int bottom = outParams.y + height;
if (bottom > displayFrameBottom) {
// The popup is too far down, move it back in.
outParams.y -= bottom - displayFrameBottom;
}
if (outParams.y < displayFrameTop) {
// The popup is too far up, move it back in and clip if
// it's still too large.
outParams.y = displayFrameTop;
final int displayFrameHeight = displayFrameBottom - displayFrameTop;
if (canResize && height > displayFrameHeight) {
outParams.height = displayFrameHeight;
} else {
fitsInDisplay = false;
}
}
outParams.y -= winOffsetY;
return fitsInDisplay;
}
private boolean tryFitHorizontal(@NonNull LayoutParams outParams, int xOffset, int width,
int anchorWidth, int drawingLocationX, int screenLocationX, int displayFrameLeft,
int displayFrameRight, boolean allowResize) {
final int anchorLeftInScreen = screenLocationX + xOffset;
final int spaceRight = displayFrameRight - anchorLeftInScreen;
if (width <= spaceRight) {
return true;
}
if (positionInDisplayHorizontal(outParams, width, drawingLocationX, screenLocationX,
displayFrameLeft, displayFrameRight, allowResize)) {
return true;
}
return false;
}
private boolean positionInDisplayHorizontal(@NonNull LayoutParams outParams, int width,
int drawingLocationX, int screenLocationX, int displayFrameLeft, int displayFrameRight,
boolean canResize) {
boolean fitsInDisplay = true;
// Use screen coordinates for comparison against display frame.
final int winOffsetX = screenLocationX - drawingLocationX;
outParams.x += winOffsetX;
final int right = outParams.x + width;
if (right > displayFrameRight) {
// The popup is too far right, move it back in.
outParams.x -= right - displayFrameRight;
}
if (outParams.x < displayFrameLeft) {
// The popup is too far left, move it back in and clip if it's
// still too large.
outParams.x = displayFrameLeft;
final int displayFrameWidth = displayFrameRight - displayFrameLeft;
if (canResize && width > displayFrameWidth) {
outParams.width = displayFrameWidth;
} else {
fitsInDisplay = false;
}
}
outParams.x -= winOffsetX;
return fitsInDisplay;
} }
/** /**