resolved conflicts for merge of 174231 to master (21373aae) · Commits · e / os / android_frameworks_base

core/java/android/widget/AutoCompleteTextView.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -123,10 +123,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe

		private AutoCompleteTextView.ListSelectorHider mHideSelector;

		// 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) {
		@@ -946,7 +942,8 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe

		/** {@inheritDoc} */
		public void onFilterComplete(int count) {
		if (mAttachCount <= 0) return;
		// Not attached to window, don't update drop-down
		if (getWindowVisibility() == View.GONE) return;

		/*
		* This checks enoughToFilter() again because filtering requests
		@@ -985,13 +982,11 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		mAttachCount++;
		}

		@Override
		protected void onDetachedFromWindow() {
		dismissDropDown();
		mAttachCount--;
		super.onDetachedFromWindow();
		}