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

Commit 383cc38a authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 6b46dc86: Merge change 8840 into donut 

Merge commit '6b46dc86'

* commit '6b46dc86':
  Add padding to height of AutoCompleteTextView drop-down.
parents 02f5228c 6b46dc86

core/java/android/widget/AutoCompleteTextView.java

+10 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
    private View mDropDownAnchorView;  // view is retrieved lazily from id once needed

    private int mDropDownWidth;

    private int mDropDownHeight;

    private final Rect mTempRect = new Rect();



    private Drawable mDropDownListHighlight;
@@ -1309,7 +1310,15 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
                getDropDownAnchorView(), mDropDownVerticalOffset, ignoreBottomDecorations);



        if (mDropDownAlwaysVisible) {

            return maxHeight;

            // getMaxAvailableHeight() subtracts the padding, so we put it back,

            // to get the available height for the whole window

            int padding = 0;

            Drawable background = mPopup.getBackground();

            if (background != null) {

                background.getPadding(mTempRect);

                padding = mTempRect.top + mTempRect.bottom;

            }

            return maxHeight + padding;

        }



        return mDropDownList.measureHeightOfChildren(MeasureSpec.UNSPECIFIED,