Merge "Bug 5319091: Completions delayed in AutoComplete in landscape" (a0383f72) · Commits · e / os / android_frameworks_base

core/java/android/widget/AutoCompleteTextView.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -744,7 +744,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		if (mFilter != null) {
		mPopupCanBeUpdated = true;
		performFiltering(getText(), mLastKeyCode);
		buildImeCompletions();
		}
		} else {
		// drop down is automatically dismissed when enough characters
		@@ -934,7 +933,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		*/

		final boolean dropDownAlwaysVisible = mPopup.isDropDownAlwaysVisible();
		if ((count > 0 \|\| dropDownAlwaysVisible) && enoughToFilter()) {
		final boolean enoughToFilter = enoughToFilter();
		if ((count > 0 \|\| dropDownAlwaysVisible) && enoughToFilter) {
		if (hasFocus() && hasWindowFocus() && mPopupCanBeUpdated) {
		showDropDown();
		}
		@@ -1045,6 +1045,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		* <p>Displays the drop down on screen.</p>
		*/
		public void showDropDown() {
		buildImeCompletions();

		if (mPopup.getAnchorView() == null) {
		if (mDropDownAnchorId != View.NO_ID) {
		mPopup.setAnchorView(getRootView().findViewById(mDropDownAnchorId));
		@@ -1086,8 +1088,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		realCount++;
		Object item = adapter.getItem(i);
		long id = adapter.getItemId(i);
		completions[i] = new CompletionInfo(id, i,
		convertSelectionToString(item));
		completions[i] = new CompletionInfo(id, i, convertSelectionToString(item));
		}
		}