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

Merge \\"PopupWindow: Resolve measure specs before passing to WM.\\" into nyc-dev am: 4a284be41d

Browse Source 
am: 7b2a3cebf6

Change-Id: I7c89cc83d9a73ab8a9761a11f6f5cbb018fe1a56
This commit is contained in:
Robert Carr
2016-06-15 16:55:03 +00:00
committed by android-build-merger
parent c295774697 7b2a3cebf6
commit 4bcb7f52ee
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1451,7 +1451,7 @@ public class PopupWindow {
if (mOutsideTouchable) { if (mOutsideTouchable) {
curFlags |= WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH; curFlags |= WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
} }
if (!mClippingEnabled) { if (!mClippingEnabled || mClipToScreen) {
curFlags |= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS; curFlags |= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
} }
if (isSplitTouchEnabled()) { if (isSplitTouchEnabled()) {
@@ -1513,14 +1513,6 @@ 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(); final Rect displayFrame = new Rect();
anchor.getWindowVisibleDisplayFrame(displayFrame); anchor.getWindowVisibleDisplayFrame(displayFrame);
if (width == MATCH_PARENT) { if (width == MATCH_PARENT) {
@@ -1534,6 +1526,11 @@ public class PopupWindow {
height = mContentView.getMeasuredHeight(); height = mContentView.getMeasuredHeight();
} }
// Let the window manager know to align the top to y.
outParams.gravity = Gravity.LEFT | Gravity.TOP;
outParams.width = width;
outParams.height = height;
// 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())
@@ -2143,7 +2140,10 @@ public class PopupWindow {
final boolean paramsChanged = oldGravity != p.gravity || oldX != p.x || oldY != p.y final boolean paramsChanged = oldGravity != p.gravity || oldX != p.x || oldY != p.y
|| oldWidth != p.width || oldHeight != p.height; || oldWidth != p.width || oldHeight != p.height;
update(p.x, p.y, p.width, p.height, paramsChanged); // If width and mWidth were both < 0 then we have a MATCH_PARENT/WRAP_CONTENT case.
// findDropDownPosition will have resolved this to absolute values,
// but we don't want to update mWidth/mHeight to these absolute values.
update(p.x, p.y, width < 0 ? width : p.width, height < 0 ? height : p.height, paramsChanged);
} }
/** /**