From 743ae65992641263ae006605462af0290aac84ad Mon Sep 17 00:00:00 2001 From: Karl Rosaen Date: Fri, 1 May 2009 14:07:02 -0700 Subject: [PATCH] make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen. before, it always computed the height based on the text view itself being the anchor. This fixes the clipping bug in the search dialog. --- core/java/android/widget/AutoCompleteTextView.java | 6 +++--- core/res/res/layout/search_bar.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 1e122a72baa12..9c10f0ad1d6ad 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -1171,9 +1171,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; diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml index 5db0737e3c6b0..b5124904e4279 100644 --- a/core/res/res/layout/search_bar.xml +++ b/core/res/res/layout/search_bar.xml @@ -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">