Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adcb8c8a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 27cec324 ec2952bc

core/java/android/widget/ListPopupWindow.java

+9 −1
Original line number Diff line number Diff line
@@ -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;

    }