Merge change 896 into donut

* changes:
  make AutoCompleteTextView take the alternate anchor view into account when computing the max available space on screen.
This commit is contained in:
Android (Google) Code Review
2009-05-01 16:32:21 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -1171,9 +1171,9 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
} }
} }
// Max height available on the screen for a popup anchored to us // Max height available on the screen for a popup
final int maxHeight = mPopup.getMaxAvailableHeight(this, mDropDownVerticalOffset); final int maxHeight =
//otherHeights += dropDownView.getPaddingTop() + dropDownView.getPaddingBottom(); mPopup.getMaxAvailableHeight(getDropDownAnchorView(), mDropDownVerticalOffset);
final int measuredHeight = mDropDownList.measureHeightOfChildren(MeasureSpec.UNSPECIFIED, final int measuredHeight = mDropDownList.measureHeightOfChildren(MeasureSpec.UNSPECIFIED,
0, ListView.NO_POSITION, maxHeight - otherHeights, 2) + otherHeights; 0, ListView.NO_POSITION, maxHeight - otherHeights, 2) + otherHeights;

View File

@@ -21,7 +21,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search_bar" android:id="@+id/search_bar"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:focusable="true" android:focusable="true"
android:descendantFocusability="afterDescendants"> android:descendantFocusability="afterDescendants">