Merge "[Search] Avoiding hiding keyboard when clearing search text" into sc-v2-dev (7a0cdc48) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/ExtendedEditText.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.view.DragEvent;
		import android.view.KeyEvent;
		import android.view.View;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.EditText;

		@@ -137,12 +136,5 @@ public class ExtendedEditText extends EditText {
		if (!TextUtils.isEmpty(getText())) {
		setText("");
		}
		if (isFocused()) {
		View nextFocus = focusSearch(View.FOCUS_DOWN);
		if (nextFocus != null) {
		nextFocus.requestFocus();
		}
		}
		hideKeyboard();
		}
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.launcher3.folder;
		import android.content.Context;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.View;
		import android.view.inputmethod.CompletionInfo;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputConnection;
		@@ -117,4 +118,16 @@ public class FolderNameEditText extends ExtendedEditText {
		return super.setComposingText(cs, newCursorPos);
		}
		}

		@Override
		public void reset() {
		super.reset();
		if (isFocused()) {
		View nextFocus = focusSearch(View.FOCUS_DOWN);
		if (nextFocus != null) {
		nextFocus.requestFocus();
		}
		}
		hideKeyboard();
		}
		}