resolve symbols

Author: LongCatIsLooong

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

@@ -980,7 +980,9 @@ public void attachToFlutterEngine(@NonNull FlutterEngine flutterEngine) {
         new KeyboardManager(
             this,
             textInputPlugin,
-            new Responder[] {new KeyChannelResponder(flutterEngine.getKeyEventChannel())});
+            new KeyChannelResponder[] {
+              new KeyChannelResponder(flutterEngine.getKeyEventChannel())
+            });
     androidTouchProcessor =
         new AndroidTouchProcessor(this.flutterEngine.getRenderer(), /*trackMotionEvents=*/ false);
     accessibilityBridge =

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

@@ -231,7 +231,9 @@ public void onPostResume() {
         new TextInputPlugin(this, new TextInputChannel(dartExecutor), platformViewsController);
     mKeyboardManager =
         new KeyboardManager(
-            this, mTextInputPlugin, new Responder[] {new KeyChannelResponder(keyEventChannel)});
+            this,
+            mTextInputPlugin,
+            new KeyChannelResponder[] {new KeyChannelResponder(keyEventChannel)});
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
       mMouseCursorPlugin = new MouseCursorPlugin(this, new MouseCursorChannel(dartExecutor));

shell/platform/android/test/io/flutter/embedding/android/KeyboardManagerTest.java

@@ -14,7 +14,7 @@
 import android.view.KeyEvent;
 import android.view.View;
 import androidx.annotation.NonNull;
-import io.flutter.embedding.android.KeyboardManager.PrimaryResponder;
+import io.flutter.embedding.android.KeyboardManager.Responder;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.systemchannels.KeyEventChannel;
@@ -33,7 +33,7 @@
 @RunWith(RobolectricTestRunner.class)
 @TargetApi(28)
 public class KeyboardManagerTest {
-  static class FakeResponder implements PrimaryResponder {
+  static class FakeResponder implements Responder {
     KeyEvent mLastKeyEvent;
     OnKeyEventHandledCallback mLastKeyEventHandledCallback;
 
@@ -84,7 +84,7 @@ public void setUp() {
         new KeyboardManager(
             mockView,
             mockTextInputPlugin,
-            new Responder[] {new KeyChannelResponder(flutterEngine.getKeyEventChannel())});
+            new Responder[] {new KeyChannelResponder(mockKeyEventChannel)});
   }
 
   // Tests start
@@ -94,7 +94,7 @@ public void respondsTrueWhenHandlingNewEvents() {
     final FakeResponder fakeResponder = new FakeResponder();
     keyboardManager =
         new KeyboardManager(
-            mockView, mockTextInputPlugin, new KeyboardManager.PrimaryResponder[] {fakeResponder});
+            mockView, mockTextInputPlugin, new KeyboardManager.Responder[] {fakeResponder});
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -111,7 +111,7 @@ public void primaryRespondersHaveTheHighestPrecedence() {
     final FakeResponder fakeResponder = new FakeResponder();
     keyboardManager =
         new KeyboardManager(
-            mockView, mockTextInputPlugin, new KeyboardManager.PrimaryResponder[] {fakeResponder});
+            mockView, mockTextInputPlugin, new KeyboardManager.Responder[] {fakeResponder});
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -131,10 +131,9 @@ public void primaryRespondersHaveTheHighestPrecedence() {
   }
 
   @Test
-  public void zeroPrimaryRespondersTest() {
+  public void zeroRespondersTest() {
     keyboardManager =
-        new KeyboardManager(
-            mockView, mockTextInputPlugin, new KeyboardManager.PrimaryResponder[] {});
+        new KeyboardManager(mockView, mockTextInputPlugin, new KeyboardManager.Responder[] {});
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
     assertEquals(true, result);
@@ -144,14 +143,14 @@ public void zeroPrimaryRespondersTest() {
   }
 
   @Test
-  public void multiplePrimaryRespondersTest() {
+  public void multipleRespondersTest() {
     final FakeResponder fakeResponder1 = new FakeResponder();
     final FakeResponder fakeResponder2 = new FakeResponder();
     keyboardManager =
         new KeyboardManager(
             mockView,
             mockTextInputPlugin,
-            new KeyboardManager.PrimaryResponder[] {fakeResponder1, fakeResponder2});
+            new KeyboardManager.Responder[] {fakeResponder1, fakeResponder2});
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -169,14 +168,14 @@ public void multiplePrimaryRespondersTest() {
   }
 
   @Test
-  public void multiplePrimaryRespondersTest2() {
+  public void multipleRespondersTest2() {
     final FakeResponder fakeResponder1 = new FakeResponder();
     final FakeResponder fakeResponder2 = new FakeResponder();
     keyboardManager =
         new KeyboardManager(
             mockView,
             mockTextInputPlugin,
-            new KeyboardManager.PrimaryResponder[] {fakeResponder1, fakeResponder2});
+            new KeyboardManager.Responder[] {fakeResponder1, fakeResponder2});
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -188,14 +187,14 @@ public void multiplePrimaryRespondersTest2() {
   }
 
   @Test
-  public void multiplePrimaryRespondersTest3() {
+  public void multipleRespondersTest3() {
     final FakeResponder fakeResponder1 = new FakeResponder();
     final FakeResponder fakeResponder2 = new FakeResponder();
     keyboardManager =
         new KeyboardManager(
             mockView,
             mockTextInputPlugin,
-            new KeyboardManager.PrimaryResponder[] {fakeResponder1, fakeResponder2});
+            new KeyboardManager.Responder[] {fakeResponder1, fakeResponder2});
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -217,9 +216,7 @@ public void textInputPluginHasTheSecondHighestPrecedence() {
     keyboardManager =
         spy(
             new KeyboardManager(
-                mockView,
-                mockTextInputPlugin,
-                new KeyboardManager.PrimaryResponder[] {fakeResponder}));
+                mockView, mockTextInputPlugin, new KeyboardManager.Responder[] {fakeResponder}));
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -251,9 +248,7 @@ public void RedispatchKeyEventIfTextInputPluginFailsToHandle() {
     keyboardManager =
         spy(
             new KeyboardManager(
-                mockView,
-                mockTextInputPlugin,
-                new KeyboardManager.PrimaryResponder[] {fakeResponder}));
+                mockView, mockTextInputPlugin, new KeyboardManager.Responder[] {fakeResponder}));
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);
 
@@ -280,9 +275,7 @@ public void respondsFalseWhenHandlingRedispatchedEvents() {
     keyboardManager =
         spy(
             new KeyboardManager(
-                mockView,
-                mockTextInputPlugin,
-                new KeyboardManager.PrimaryResponder[] {fakeResponder}));
+                mockView, mockTextInputPlugin, new KeyboardManager.Responder[] {fakeResponder}));
     final KeyEvent keyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
     final boolean result = keyboardManager.handleEvent(keyEvent);