Revert "Plumb a reference of PlatformViewsController and AccessibilityBridge to each other (flutter#8208)"

This reverts commit f0e02d3.

Author: RBogie

ci/licenses_golden/licenses_flutter

@@ -516,7 +516,6 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/Platfor
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistryImpl.java
-FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java

shell/platform/android/BUILD.gn

@@ -158,7 +158,6 @@ java_library("flutter_shell_java") {
     "io/flutter/plugin/platform/PlatformViewFactory.java",
     "io/flutter/plugin/platform/PlatformViewRegistry.java",
     "io/flutter/plugin/platform/PlatformViewRegistryImpl.java",
-    "io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java",
     "io/flutter/plugin/platform/PlatformViewsController.java",
     "io/flutter/plugin/platform/SingleViewPresentation.java",
     "io/flutter/plugin/platform/VirtualDisplayController.java",

shell/platform/android/io/flutter/app/FlutterPluginRegistry.java

@@ -94,10 +94,6 @@ public void onPreEngineRestart() {
         mPlatformViewsController.onPreEngineRestart();
     }
 
-    public PlatformViewsController getPlatformViewsController() {
-        return mPlatformViewsController;
-    }
-
     private class FlutterRegistrar implements Registrar {
         private final String pluginKey;
 

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

@@ -447,10 +447,7 @@ public void attachToFlutterEngine(@NonNull FlutterEngine flutterEngine) {
         this,
         flutterEngine.getAccessibilityChannel(),
         (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE),
-        getContext().getContentResolver(),
-        // TODO(mattcaroll): plumb the platform views controller to the accessibility bridge.
-        // https://github.com/flutter/flutter/issues/29618
-        null
+        getContext().getContentResolver()
     );
     accessibilityBridge.setOnAccessibilityChangeListener(onAccessibilityChangeListener);
     resetWillNotDraw(

shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java

@@ -14,7 +14,6 @@
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.StandardMethodCodec;
-import io.flutter.view.AccessibilityBridge;
 import io.flutter.view.TextureRegistry;
 
 import java.nio.ByteBuffer;
@@ -32,7 +31,7 @@
  * Each {@link io.flutter.app.FlutterPluginRegistry} has a single platform views controller.
  * A platform views controller can be attached to at most one Flutter view.
  */
-public class PlatformViewsController implements MethodChannel.MethodCallHandler, PlatformViewsAccessibilityDelegate {
+public class PlatformViewsController implements MethodChannel.MethodCallHandler {
     private static final String TAG = "PlatformViewsController";
 
     private static final String CHANNEL_NAME = "flutter/platform_views";
@@ -51,9 +50,6 @@ public class PlatformViewsController implements MethodChannel.MethodCallHandler,
     // The messenger used to communicate with the framework over the platform views channel.
     private BinaryMessenger mMessenger;
 
-    // The accessibility bridge to which accessibility events form the platform views will be dispatched.
-    private AccessibilityBridge accessibilityBridge;
-
     private final HashMap<Integer, VirtualDisplayController> vdControllers;
 
     public PlatformViewsController() {
@@ -98,25 +94,6 @@ public void detach() {
         mTextureRegistry = null;
     }
 
-    /**
-     * Attaches an accessibility bridge for this platform views controller.
-     *
-     * Accessibility events sent by platform views that belonging to this controller will be
-     * dispatched to this accessibility bridge.
-     */
-    public void attachAccessibilityBridge(AccessibilityBridge accessibilityBridge) {
-        this.accessibilityBridge = accessibilityBridge;
-    }
-
-    /**
-     * Detaches the current accessibility bridge.
-     *
-     * Any accessibility events sent by platform views belonging to this controller will be ignored.
-     */
-    public void detachAccessibiltyBridge() {
-        this.accessibilityBridge = null;
-    }
-
     public PlatformViewRegistry getRegistry() {
         return mRegistry;
     }
@@ -129,17 +106,6 @@ public void onPreEngineRestart() {
         flushAllViews();
     }
 
-    /**
-     * Returns the embedded view with id, or null if no view with this id is registered.
-     */
-    public View getPlatformViewById(Integer id) {
-        VirtualDisplayController controller = vdControllers.get(id);
-        if (controller == null) {
-            return null;
-        }
-        return controller.getView();
-    }
-
     @Override
     public void onMethodCall(final MethodCall call, final MethodChannel.Result result) {
         if (Build.VERSION.SDK_INT < MINIMAL_SDK) {

shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java

@@ -15,6 +15,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
@@ -26,8 +27,8 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 
+import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.systemchannels.AccessibilityChannel;
-import io.flutter.plugin.platform.PlatformViewsAccessibilityDelegate;
 import io.flutter.util.Predicate;
 
 import java.nio.ByteBuffer;
@@ -89,11 +90,6 @@ public class AccessibilityBridge extends AccessibilityNodeProvider {
     @NonNull
     private final AccessibilityManager accessibilityManager;
 
-    // The delegate for interacting with embedded platform views. Used to embed accessibility data for an embedded
-    // view in the accessibility tree.
-    @NonNull
-    private final PlatformViewsAccessibilityDelegate platformViewsAccessibilityDelegate;
-
     // Android's {@link ContentResolver}, which is used to observe the global TRANSITION_ANIMATION_SCALE,
     // which determines whether Flutter's animations should be enabled or disabled for accessibility
     // purposes.
@@ -311,14 +307,12 @@ public AccessibilityBridge(
         @NonNull View rootAccessibilityView,
         @NonNull AccessibilityChannel accessibilityChannel,
         @NonNull AccessibilityManager accessibilityManager,
-        @NonNull ContentResolver contentResolver,
-        @NonNull PlatformViewsAccessibilityDelegate platformViewsAccessibilityDelegate
+        @NonNull ContentResolver contentResolver
     ) {
         this.rootAccessibilityView = rootAccessibilityView;
         this.accessibilityChannel = accessibilityChannel;
         this.accessibilityManager = accessibilityManager;
         this.contentResolver = contentResolver;
-        this.platformViewsAccessibilityDelegate = platformViewsAccessibilityDelegate;
 
         decorView = ((Activity) rootAccessibilityView.getContext()).getWindow().getDecorView();
 

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

@@ -43,7 +43,6 @@
 import io.flutter.plugin.common.*;
 import io.flutter.plugin.editing.TextInputPlugin;
 import io.flutter.plugin.platform.PlatformPlugin;
-import io.flutter.plugin.platform.PlatformViewsController;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -661,15 +660,12 @@ public void onFirstFrame() {
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
 
-        PlatformViewsController platformViewsController = getPluginRegistry().getPlatformViewsController();
         mAccessibilityNodeProvider = new AccessibilityBridge(
             this,
             new AccessibilityChannel(dartExecutor, getFlutterNativeView().getFlutterJNI()),
             (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE),
-            getContext().getContentResolver(),
-            platformViewsController
+            getContext().getContentResolver()
         );
-        platformViewsController.attachAccessibilityBridge(mAccessibilityNodeProvider);
         mAccessibilityNodeProvider.setOnAccessibilityChangeListener(onAccessibilityChangeListener);
 
         resetWillNotDraw(
@@ -682,7 +678,6 @@ protected void onAttachedToWindow() {
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
-        getPluginRegistry().getPlatformViewsController().detachAccessibiltyBridge();
         mAccessibilityNodeProvider.release();
         mAccessibilityNodeProvider = null;
     }