Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6415 into donut

Browse Source 
* changes:
  Fixes #1748951. Calling setListSelection() explicitely should cancel the selection hidden flag.
This commit is contained in:
Android (Google) Code Review
2009-07-07 15:19:14 -07:00
parent a7de384550 fb7ed10735
commit 7bf9f930d9
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/widget/AutoCompleteTextView.java
View File

@@ -837,6 +837,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
*/ */
public void setListSelection(int position) { public void setListSelection(int position) {
if (mPopup.isShowing() && (mDropDownList != null)) { if (mPopup.isShowing() && (mDropDownList != null)) {
mDropDownList.mListSelectionHidden = false;
mDropDownList.setSelection(position); mDropDownList.setSelection(position);
// ListView.setSelection() will call requestLayout() // ListView.setSelection() will call requestLayout()
} }

2
tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java
View File

@@ -18,6 +18,7 @@ package android.widget;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
import android.test.FlakyTest;
import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.MediumTest;
/** /**
@@ -149,6 +150,7 @@ public class AutoCompleteTextViewPopup
} }
/** Test the show/hide behavior of the drop-down. */ /** Test the show/hide behavior of the drop-down. */
@FlakyTest(tolerance=5)
@MediumTest @MediumTest
public void testPopupShow() throws Throwable { public void testPopupShow() throws Throwable {
AutoCompleteTextViewSimple theActivity = getActivity(); AutoCompleteTextViewSimple theActivity = getActivity();