remove setKeyboardManager

Author: LongCatIsLooong

shell/platform/android/io/flutter/embedding/android/FlutterView.java

@@ -705,7 +705,7 @@ public InputConnection onCreateInputConnection(@NonNull EditorInfo outAttrs) {
       return super.onCreateInputConnection(outAttrs);
     }
 
-    return textInputPlugin.createInputConnection(this, outAttrs);
+    return textInputPlugin.createInputConnection(this, keyboardManager, outAttrs);
   }
 
   /**
@@ -979,7 +979,7 @@ public void attachToFlutterEngine(@NonNull FlutterEngine flutterEngine) {
     keyboardManager =
         new KeyboardManager(
             this,
-            mTextInputPlugin,
+            textInputPlugin,
             new Responder[] {new KeyChannelResponder(flutterEngine.getKeyEventChannel())});
     androidTouchProcessor =
         new AndroidTouchProcessor(this.flutterEngine.getRenderer(), /*trackMotionEvents=*/ false);

shell/platform/android/io/flutter/embedding/android/KeyboardManager.java

@@ -166,7 +166,7 @@ public boolean handleEvent(@NonNull KeyEvent keyEvent) {
       onUnhandled(keyEvent);
     }
 
-    return !isRedispatchedEvent;
+    return true;
   }
 
   public void destroy() {

shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java

@@ -47,7 +47,7 @@ class InputConnectionAdaptor extends BaseInputConnection
   private InputMethodManager mImm;
   private final Layout mLayout;
   private FlutterTextUtils flutterTextUtils;
-  private final KeyboardManager mKeyboardManager;
+  private final KeyboardManager keyboardManager;
 
   @SuppressWarnings("deprecation")
   public InputConnectionAdaptor(
@@ -65,7 +65,7 @@ public InputConnectionAdaptor(
     mEditable = editable;
     mEditable.addEditingStateListener(this);
     mEditorInfo = editorInfo;
-    mKeyboardManager = keyboardManager;
+    this.keyboardManager = keyboardManager;
     this.flutterTextUtils = new FlutterTextUtils(flutterJNI);
     // We create a dummy Layout with max width so that the selection
     // shifting acts as if all text were in one line.
@@ -290,7 +290,7 @@ private static int clampIndexToEditable(int index, Editable editable) {
   // occur, and need a chance to be handled by the framework.
   @Override
   public boolean sendKeyEvent(KeyEvent event) {
-    return mKeyboardManager.handleEvent(event);
+    return keyboardManager.handleEvent(event);
   }
 
   public boolean handleKeyEvent(KeyEvent event) {

shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java

@@ -49,7 +49,6 @@ public class TextInputPlugin implements ListenableEditingState.EditingStateWatch
   @NonNull private PlatformViewsController platformViewsController;
   @Nullable private Rect lastClientRect;
   private ImeSyncDeferringInsetsCallback imeSyncCallback;
-  private KeyboardManager keyboardManager;
 
   // Initialize the "last seen" text editing values to a non-null value.
   private TextEditState mLastKnownFrameworkTextEditingState;
@@ -176,9 +175,6 @@ ImeSyncDeferringInsetsCallback getImeSyncCallback() {
     return imeSyncCallback;
   }
 
-  public void setKeyboardManager(KeyboardManager keyboardManager) {
-    this.keyboardManager = keyboardManager;
-  }
   /**
    * Use the current platform view input connection until unlockPlatformViewInputConnection is
    * called.
@@ -281,7 +277,8 @@ private static int inputTypeFromTextInputType(
     return textType;
   }
 
-  public InputConnection createInputConnection(View view, EditorInfo outAttrs) {
+  public InputConnection createInputConnection(
+      View view, KeyboardManager keyboardManager, EditorInfo outAttrs) {
     if (inputTarget.type == InputTarget.Type.NO_TARGET) {
       lastInputConnection = null;
       return null;

shell/platform/android/io/flutter/view/FlutterView.java

@@ -231,7 +231,6 @@ public void onPostResume() {
     mKeyboardManager =
         new KeyboardManager(
             this, mTextInputPlugin, new Responder[] {new KeyChannelResponder(keyEventChannel)});
-    mTextInputPlugin.setKeyboardManager(mKeyboardManager);
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
       mMouseCursorPlugin = new MouseCursorPlugin(this, new MouseCursorChannel(dartExecutor));
@@ -446,7 +445,7 @@ public void destroy() {
 
   @Override
   public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-    return mTextInputPlugin.createInputConnection(this, outAttrs);
+    return mTextInputPlugin.createInputConnection(this, mKeyboardManager, outAttrs);
   }
 
   @Override

shell/platform/android/test/io/flutter/plugin/editing/TextInputPluginTest.java

@@ -210,7 +210,8 @@ public void inputConnectionAdaptor_RepeatFilter() throws NullPointerException {
         .updateEditingState(anyInt(), any(), anyInt(), anyInt(), anyInt(), anyInt());
 
     InputConnectionAdaptor inputConnectionAdaptor =
-        (InputConnectionAdaptor) textInputPlugin.createInputConnection(testView, outAttrs);
+        (InputConnectionAdaptor)
+            textInputPlugin.createInputConnection(testView, mock(KeyboardManager.class), outAttrs);
 
     inputConnectionAdaptor.beginBatchEdit();
     verify(textInputChannel, times(0))
@@ -376,7 +377,9 @@ public void setTextInputEditingState_restartsIMEOnlyWhenFrameworkChangesComposin
     textInputPlugin.setTextInputEditingState(
         testView, new TextInputChannel.TextEditState("", 0, 0, -1, -1));
     assertEquals(1, testImm.getRestartCount(testView));
-    InputConnection connection = textInputPlugin.createInputConnection(testView, new EditorInfo());
+    InputConnection connection =
+        textInputPlugin.createInputConnection(
+            testView, mock(KeyboardManager.class), new EditorInfo());
     connection.setComposingText("POWERRRRR", 1);
 
     textInputPlugin.setTextInputEditingState(
@@ -521,7 +524,9 @@ public void inputConnection_createsActionFromEnter() throws JSONException {
     assertEquals("flutter/textinput", channelCaptor.getValue());
     verifyMethodCall(bufferCaptor.getValue(), "TextInputClient.requestExistingInputState", null);
     InputConnectionAdaptor connection =
-        (InputConnectionAdaptor) textInputPlugin.createInputConnection(testView, new EditorInfo());
+        (InputConnectionAdaptor)
+            textInputPlugin.createInputConnection(
+                testView, mock(KeyboardManager.class), new EditorInfo());
 
     connection.handleKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
     verify(dartExecutor, times(2))
@@ -586,7 +591,9 @@ public void inputConnection_finishComposingTextUpdatesIMM() throws JSONException
     // There's a pending restart since we initialized the text input client. Flush that now.
     textInputPlugin.setTextInputEditingState(
         testView, new TextInputChannel.TextEditState("text", 0, 0, -1, -1));
-    InputConnection connection = textInputPlugin.createInputConnection(testView, new EditorInfo());
+    InputConnection connection =
+        textInputPlugin.createInputConnection(
+            testView, mock(KeyboardManager.class), new EditorInfo());
 
     connection.requestCursorUpdates(
         InputConnection.CURSOR_UPDATE_MONITOR | InputConnection.CURSOR_UPDATE_IMMEDIATE);