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

PopupWindow: Don't ignore top decorations in getMaxAvailableHeight.

Browse Source 
getMaxAvailableHeight is ignoring the top insets, while
findDropDownPosition is not. This is causing getMaxAvailableHeight
to return a fits above position that findDropDownPosition will think
is too large.

Bug: 31048766
Change-Id: Ifa57cb4ebe0944c701a6f38b58d4f144d8b9199c
This commit is contained in:
Robert Carr
2016-09-06 19:07:39 -07:00
parent 735b9eca0f
commit 701d73084d
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1758,11 +1758,22 @@ public class PopupWindow {
*/
public int getMaxAvailableHeight(
@NonNull View anchor, int yOffset, boolean ignoreBottomDecorations) {
final Rect displayFrame = new Rect();
Rect displayFrame = null;
final Rect visibleDisplayFrame = new Rect();
anchor.getWindowVisibleDisplayFrame(visibleDisplayFrame);
if (ignoreBottomDecorations) {
// In the ignore bottom decorations case we want to
// still respect all other decorations so we use the inset visible
// frame on the top right and left and take the bottom
// value from the full frame.
displayFrame = new Rect();
anchor.getWindowDisplayFrame(displayFrame);
displayFrame.top = visibleDisplayFrame.top;
displayFrame.right = visibleDisplayFrame.right;
displayFrame.left = visibleDisplayFrame.left;
} else {
anchor.getWindowVisibleDisplayFrame(displayFrame);
displayFrame = visibleDisplayFrame;
}
final int[] anchorPos = mTmpDrawingLocation;