Merge remote-tracking branch 'aosp/android12L-release' into 12.1-dev

src/com/android/launcher3/ExtendedEditText.java

@@ -22,11 +22,9 @@ 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;
 
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.views.ActivityContext;
 
 import app.lawnchair.font.FontManager;
@@ -103,10 +101,6 @@ public class ExtendedEditText extends EditText {
         }
     }
 
-    // inherited class can override to change the appearance of the edit text.
-    public void show() {}
-    public void hide() {}
-
     public void showKeyboard() {
         mShowImeAfterFirstLayout = !showSoftInput();
     }
@@ -145,15 +139,5 @@ public class ExtendedEditText extends EditText {
         if (!TextUtils.isEmpty(getText())) {
             setText("");
         }
-        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {
-            return;
-        }
-        if (isFocused()) {
-            View nextFocus = focusSearch(View.FOCUS_DOWN);
-            if (nextFocus != null) {
-                nextFocus.requestFocus();
-            }
-        }
-        hideKeyboard();
     }
 }