summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/AutoCompleteTextView.java1
-rw-r--r--tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 2182384..675aba2 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -837,6 +837,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
*/
public void setListSelection(int position) {
if (mPopup.isShowing() && (mDropDownList != null)) {
+ mDropDownList.mListSelectionHidden = false;
mDropDownList.setSelection(position);
// ListView.setSelection() will call requestLayout()
}
diff --git a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java b/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
index 6f89fce..5ae960a 100644
--- a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
+++ b/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
@@ -18,6 +18,7 @@ package android.widget;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
+import android.test.FlakyTest;
import android.test.suitebuilder.annotation.MediumTest;
/**
@@ -149,6 +150,7 @@ public class AutoCompleteTextViewPopup
}
/** Test the show/hide behavior of the drop-down. */
+ @FlakyTest(tolerance=5)
@MediumTest
public void testPopupShow() throws Throwable {
AutoCompleteTextViewSimple theActivity = getActivity();