Bug 711185: Restrict autocomplete height to rows present and space available. [r=mfinkle]

mobile/android/base/AutoCompletePopup.java

@@ -68,7 +68,9 @@ public class AutoCompletePopup extends ListView {
     private static final String LOGTAG = "AutoCompletePopup";
 
     private static int sMinWidth = 0;
+    private static int sRowHeight = 0;
     private static final int AUTOCOMPLETE_MIN_WIDTH_IN_DPI = 200;
+    private static final int AUTOCOMPLETE_ROW_HEIGHT_IN_DPI = 32;
 
     public AutoCompletePopup(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -100,11 +102,10 @@ public class AutoCompletePopup extends ListView {
 
         setAdapter(adapter);
 
-        if (isShown())
-            return;
-
-        setVisibility(View.VISIBLE);
-        startAnimation(mAnimation);
+        if (!isShown()) {
+            setVisibility(View.VISIBLE);
+            startAnimation(mAnimation);
+        }
 
         if (mLayout == null) {
             mLayout = (RelativeLayout.LayoutParams) getLayoutParams();
@@ -136,6 +137,7 @@ public class AutoCompletePopup extends ListView {
             DisplayMetrics metrics = new DisplayMetrics();
             GeckoApp.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
             sMinWidth = (int) (AUTOCOMPLETE_MIN_WIDTH_IN_DPI * metrics.density);
+            sRowHeight = (int) (AUTOCOMPLETE_ROW_HEIGHT_IN_DPI * metrics.density);
         }
 
         // If the textbox is smaller than the screen-width,
@@ -151,10 +153,25 @@ public class AutoCompletePopup extends ListView {
                 listLeft = (int) (viewport.width - listWidth);
         }
 
-        // If the list is extending outside of the viewport
-        // try moving above
-        if (((listTop + listHeight) > viewport.height) && (listHeight <= top))
-            listTop = (top - listHeight);
+        listHeight = sRowHeight * adapter.getCount();
+
+        // The text box doesnt fit below
+        if ((listTop + listHeight) > viewport.height) {
+            // Find where the maximum space is, and fit it there
+            if ((viewport.height - listTop) > top) {
+                // Shrink the height to fit it below the text-box
+                listHeight = (int) (viewport.height - listTop);
+            } else {
+                if (listHeight < top) {
+                    // No shrinking needed to fit on top
+                    listTop = (top - listHeight);
+                } else {
+                    // Shrink to available space on top
+                    listTop = 0;
+                    listHeight = top;
+                }
+           }
+        }
 
         mLayout = new RelativeLayout.LayoutParams(listWidth, listHeight);
         mLayout.setMargins(listLeft, listTop, 0, 0);

mobile/android/base/resources/layout-v11/gecko_app.xml

@@ -16,7 +16,7 @@
         <org.mozilla.gecko.AutoCompletePopup android:id="@+id/autocomplete_popup"
                                              style="@android:style/Widget.Holo.ListView"
                                              android:layout_width="fill_parent"
-                                             android:layout_height="100dip"
+                                             android:layout_height="fill_parent"
                                              android:background="@drawable/autocomplete_list_bg"
                                              android:cacheColorHint="#ffffff"
                                              android:visibility="gone"/>

mobile/android/base/resources/layout/autocomplete_list_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
+          android:layout_height="32dip"
           android:textAppearance="?android:attr/textAppearanceMediumInverse"
           android:textColor="?android:attr/textColorPrimaryInverse"
           android:layout_gravity="center_vertical"

mobile/android/base/resources/layout/gecko_app.xml

@@ -18,7 +18,7 @@
         <org.mozilla.gecko.AutoCompletePopup android:id="@+id/autocomplete_popup"
                                              style="@android:style/Widget.ListView.White"
                                              android:layout_width="fill_parent"
-                                             android:layout_height="100dip"
+                                             android:layout_height="fill_parent"
                                              android:background="@drawable/autocomplete_list_bg"
                                              android:cacheColorHint="#ffffff"
                                              android:visibility="gone"/>