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

Merge "Don't allow the negative height of ListPopupWindow" into oc-dev

Browse Source 
am: adcb8c8a62

Change-Id: Iaa38eb853169a6b8ca98d59f88116bd70a597838
This commit is contained in:
Shunta Sato
2017-03-28 20:52:20 +00:00
committed by android-build-merger
parent efb80cc207 adcb8c8a62
commit 4b2ddf93d1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/ListPopupWindow.java
View File

@@ -523,9 +523,17 @@ public class ListPopupWindow implements ShowableListMenu {
/**
* Sets the height of the popup window in pixels. Can also be {@link #MATCH_PARENT}.
*
* @param height Height of the popup window.
* @param height Height of the popup window must be a positive value,
* {@link #MATCH_PARENT}, or {@link #WRAP_CONTENT}.
*
* @throws IllegalArgumentException if height is set to negative value
*/
public void setHeight(int height) {
if (height < 0 && ViewGroup.LayoutParams.WRAP_CONTENT != height
&& ViewGroup.LayoutParams.MATCH_PARENT != height) {
throw new IllegalArgumentException(
"Invalid height. Must be a positive value, MATCH_PARENT, or WRAP_CONTENT.");
}
mDropDownHeight = height;
}