Merge "API fix, AutoCompleteTextView" into jb-dev

api/current.txt

@@ -26756,6 +26756,7 @@ package android.widget {
     method public void dismissDropDown();
     method public boolean enoughToFilter();
     method public android.widget.ListAdapter getAdapter();
+    method public java.lang.CharSequence getCompletionHint();
     method public int getDropDownAnchor();
     method public android.graphics.drawable.Drawable getDropDownBackground();
     method public int getDropDownHeight();

core/java/android/widget/AutoCompleteTextView.java

@@ -218,6 +218,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      *
      * @param hint the text to be displayed to the user
      *
+     * @see #getCompletionHint()
+     *
      * @attr ref android.R.styleable#AutoCompleteTextView_completionHint
      */
     public void setCompletionHint(CharSequence hint) {
@@ -237,7 +239,20 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
             mHintView = null;
         }
     }
-    
+
+    /**
+     * Gets the optional hint text displayed at the bottom of the the matching list.
+     *
+     * @return The hint text, if any
+     *
+     * @see #setCompletionHint(CharSequence)
+     *
+     * @attr ref android.R.styleable#AutoCompleteTextView_completionHint
+     */
+    public CharSequence getCompletionHint() {
+        return mHintText;
+    }
+
     /**
      * <p>Returns the current width for the auto-complete drop down list. This can
      * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or
@@ -468,6 +483,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * @return the minimum number of characters to type to show the drop down
      *
      * @see #setThreshold(int)
+     *
+     * @attr ref android.R.styleable#AutoCompleteTextView_completionThreshold
      */
     public int getThreshold() {
         return mThreshold;