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

Commit 3ee2f818 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 854c8c78: Merge change 896 into donut 

Merge commit '854c8c78'

* commit '854c8c78':
  make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen.
parents 26504548 854c8c78

core/java/android/widget/AutoCompleteTextView.java

+3 −3
Original line number Diff line number Diff line
@@ -1130,9 +1130,9 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe 
            }

        }



        // Max height available on the screen for a popup anchored to us

        final int maxHeight = mPopup.getMaxAvailableHeight(this, mDropDownVerticalOffset);

        //otherHeights += dropDownView.getPaddingTop() + dropDownView.getPaddingBottom();

        // Max height available on the screen for a popup

        final int maxHeight =

                mPopup.getMaxAvailableHeight(getDropDownAnchorView(), mDropDownVerticalOffset);



        final int measuredHeight = mDropDownList.measureHeightOfChildren(MeasureSpec.UNSPECIFIED,

                0, ListView.NO_POSITION, maxHeight - otherHeights, 2) + otherHeights;

core/res/res/layout/search_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/search_bar"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:focusable="true"

    android:descendantFocusability="afterDescendants">