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

Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a

Browse Source 
am: bf2a2fa

* commit 'bf2a2fafaf7659352dbc36de507e52dceceecaad':
  Respect WRAP_CONTENT when resolving drop down position.

Change-Id: I82ab0dcef53f34ba5275826e47a724842bd6cdd8
This commit is contained in:
Rob Carr
2016-04-20 21:14:41 +00:00
committed by android-build-merger
parent d0fd8d6071 bf2a2fafaf
commit ae3539f055
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,8 @@ import java.lang.ref.WeakReference;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
/** /**
* <p> * <p>
@@ -1305,15 +1307,15 @@ public class PopupWindow {
private PopupBackgroundView createBackgroundView(View contentView) { private PopupBackgroundView createBackgroundView(View contentView) {
final ViewGroup.LayoutParams layoutParams = mContentView.getLayoutParams(); final ViewGroup.LayoutParams layoutParams = mContentView.getLayoutParams();
final int height; final int height;
if (layoutParams != null && layoutParams.height == ViewGroup.LayoutParams.WRAP_CONTENT) { if (layoutParams != null && layoutParams.height == WRAP_CONTENT) {
height = ViewGroup.LayoutParams.WRAP_CONTENT; height = WRAP_CONTENT;
} else { } else {
height = ViewGroup.LayoutParams.MATCH_PARENT; height = MATCH_PARENT;
} }
final PopupBackgroundView backgroundView = new PopupBackgroundView(mContext); final PopupBackgroundView backgroundView = new PopupBackgroundView(mContext);
final PopupBackgroundView.LayoutParams listParams = new PopupBackgroundView.LayoutParams( final PopupBackgroundView.LayoutParams listParams = new PopupBackgroundView.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, height); MATCH_PARENT, height);
backgroundView.addView(contentView, listParams); backgroundView.addView(contentView, listParams);
return backgroundView; return backgroundView;
@@ -1328,14 +1330,14 @@ public class PopupWindow {
private PopupDecorView createDecorView(View contentView) { private PopupDecorView createDecorView(View contentView) {
final ViewGroup.LayoutParams layoutParams = mContentView.getLayoutParams(); final ViewGroup.LayoutParams layoutParams = mContentView.getLayoutParams();
final int height; final int height;
if (layoutParams != null && layoutParams.height == ViewGroup.LayoutParams.WRAP_CONTENT) { if (layoutParams != null && layoutParams.height == WRAP_CONTENT) {
height = ViewGroup.LayoutParams.WRAP_CONTENT; height = WRAP_CONTENT;
} else { } else {
height = ViewGroup.LayoutParams.MATCH_PARENT; height = MATCH_PARENT;
} }
final PopupDecorView decorView = new PopupDecorView(mContext); final PopupDecorView decorView = new PopupDecorView(mContext);
decorView.addView(contentView, ViewGroup.LayoutParams.MATCH_PARENT, height); decorView.addView(contentView, MATCH_PARENT, height);
decorView.setClipChildren(false); decorView.setClipChildren(false);
decorView.setClipToPadding(false); decorView.setClipToPadding(false);
@@ -1522,11 +1524,15 @@ public class PopupWindow {
// to fill in real width and height values. // 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 < 0) { if (width == MATCH_PARENT) {
width = displayFrame.right - displayFrame.left; width = displayFrame.right - displayFrame.left;
} else if (width == WRAP_CONTENT) {
width = mContentView.getMeasuredWidth();
} }
if (height < 0) { if (height == MATCH_PARENT) {
height = displayFrame.bottom - displayFrame.top; height = displayFrame.bottom - displayFrame.top;
} else if (height == WRAP_CONTENT) {
height = mContentView.getMeasuredHeight();
} }
// 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