1 files changed, 33 insertions, 50 deletions

diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index a1d16ea..bfc5f08 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -126,7 +126,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
     // Indicates whether this AutoCompleteTextView is attached to a window or not
     // The widget is attached to a window when mAttachCount > 0
     private int mAttachCount;
-
+    
     private AutoCompleteTextView.PassThroughClickListener mPassThroughClickListener;
 
     public AutoCompleteTextView(Context context) {
@@ -188,7 +188,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
         setFocusable(true);
 
         addTextChangedListener(new MyWatcher());
-
+        
         mPassThroughClickListener = new PassThroughClickListener();
         super.setOnClickListener(mPassThroughClickListener);
     }
@@ -290,8 +290,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * @return the background drawable
      * 
      * @attr ref android.R.styleable#PopupWindow_popupBackground
-     *
-     * @hide Pending API council approval
      */
     public Drawable getDropDownBackground() {
         return mPopup.getBackground();
@@ -303,8 +301,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * @param d the drawable to set as the background
      * 
      * @attr ref android.R.styleable#PopupWindow_popupBackground
-     *
-     * @hide Pending API council approval
      */
     public void setDropDownBackgroundDrawable(Drawable d) {
         mPopup.setBackgroundDrawable(d);
@@ -316,47 +312,15 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * @param id the id of the drawable to set as the background
      * 
      * @attr ref android.R.styleable#PopupWindow_popupBackground
-     *
-     * @hide Pending API council approval
      */
     public void setDropDownBackgroundResource(int id) {
         mPopup.setBackgroundDrawable(getResources().getDrawable(id));
     }
-
-    /**
-     * <p>Sets the animation style of the auto-complete drop-down list.</p>
-     *
-     * <p>If the drop-down is showing, calling this method will take effect only
-     * the next time the drop-down is shown.</p>
-     *
-     * @param animationStyle animation style to use when the drop-down appears
-     *      and disappears.  Set to -1 for the default animation, 0 for no
-     *      animation, or a resource identifier for an explicit animation.
-     *
-     * @hide Pending API council approval
-     */
-    public void setDropDownAnimationStyle(int animationStyle) {
-        mPopup.setAnimationStyle(animationStyle);
-    }
-
-    /**
-     * <p>Returns the animation style that is used when the drop-down list appears and disappears
-     * </p>
-     *
-     * @return the animation style that is used when the drop-down list appears and disappears
-     *
-     * @hide Pending API council approval
-     */
-    public int getDropDownAnimationStyle() {
-        return mPopup.getAnimationStyle();
-    }
     
     /**
      * <p>Sets the vertical offset used for the auto-complete drop-down list.</p>
      * 
      * @param offset the vertical offset
-     *
-     * @hide Pending API council approval
      */
     public void setDropDownVerticalOffset(int offset) {
         mDropDownVerticalOffset = offset;
@@ -366,8 +330,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * <p>Gets the vertical offset used for the auto-complete drop-down list.</p>
      * 
      * @return the vertical offset
-     *
-     * @hide Pending API council approval
      */
     public int getDropDownVerticalOffset() {
         return mDropDownVerticalOffset;
@@ -377,8 +339,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * <p>Sets the horizontal offset used for the auto-complete drop-down list.</p>
      * 
      * @param offset the horizontal offset
-     *
-     * @hide Pending API council approval
      */
     public void setDropDownHorizontalOffset(int offset) {
         mDropDownHorizontalOffset = offset;
@@ -388,13 +348,39 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
      * <p>Gets the horizontal offset used for the auto-complete drop-down list.</p>
      * 
      * @return the horizontal offset
-     *
-     * @hide Pending API council approval
      */
     public int getDropDownHorizontalOffset() {
         return mDropDownHorizontalOffset;
     }
 
+     /**
+     * <p>Sets the animation style of the auto-complete drop-down list.</p>
+     *
+     * <p>If the drop-down is showing, calling this method will take effect only
+     * the next time the drop-down is shown.</p>
+     *
+     * @param animationStyle animation style to use when the drop-down appears
+     *      and disappears.  Set to -1 for the default animation, 0 for no
+     *      animation, or a resource identifier for an explicit animation.
+     *
+     * @hide Pending API council approval
+     */
+    public void setDropDownAnimationStyle(int animationStyle) {
+        mPopup.setAnimationStyle(animationStyle);
+    }
+
+    /**
+     * <p>Returns the animation style that is used when the drop-down list appears and disappears
+     * </p>
+     *
+     * @return the animation style that is used when the drop-down list appears and disappears
+     *
+     * @hide Pending API council approval
+     */
+    public int getDropDownAnimationStyle() {
+        return mPopup.getAnimationStyle();
+    }
+
     /**
      * @return Whether the drop-down is visible as long as there is {@link #enoughToFilter()}
      *
@@ -1074,10 +1060,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
             }
             mPopup.setHeight(height);
             mPopup.setInputMethodMode(PopupWindow.INPUT_METHOD_NEEDED);
-            
-            // use outside touchable to dismiss drop down when touching outside of it, so
-            // only set this if the dropdown is not always visible
-            mPopup.setOutsideTouchable(!mDropDownAlwaysVisible);
+            mPopup.setOutsideTouchable(true);
             mPopup.setTouchInterceptor(new PopupTouchIntercepter());
             mPopup.showAsDropDown(getDropDownAnchorView(),
                     mDropDownHorizontalOffset, mDropDownVerticalOffset);
@@ -1399,7 +1382,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
          */
         CharSequence fixText(CharSequence invalidText);
     }
-
+    
     /**
      * Allows us a private hook into the on click event without preventing users from setting
      * their own click listener.
@@ -1415,5 +1398,5 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
             if (mWrapped != null) mWrapped.onClick(v);
         }
     }
-
+    
 }