refactor

Author: Emmanuel Garcia

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

@@ -66,22 +66,16 @@ default void onFlutterViewDetached() {}
    *
    * <p>This hook only exists for rare cases where the plugin relies on the state of the input
    * connection. This probably doesn't need to be implemented.
-   *
-   * <p>This method is deprecated, and will be removed in a future release.
    */
   @SuppressLint("NewApi")
-  @Deprecated
   default void onInputConnectionLocked() {}
 
   /**
    * Callback fired when the platform input connection has been unlocked.
    *
    * <p>This hook only exists for rare cases where the plugin relies on the state of the input
    * connection. This probably doesn't need to be implemented.
-   *
-   * <p>This method is deprecated, and will be removed in a future release.
    */
   @SuppressLint("NewApi")
-  @Deprecated
   default void onInputConnectionUnlocked() {}
 }

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

@@ -12,6 +12,7 @@
 import android.app.Presentation;
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.content.MutableContextWrapper;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
@@ -72,8 +73,6 @@ static class PresentationState {
     private FakeWindowViewGroup fakeWindowViewGroup;
   }
 
-  private final PlatformViewFactory viewFactory;
-
   // A reference to the current accessibility bridge to which accessibility events will be
   // delegated.
   private final AccessibilityEventsDelegate accessibilityEventsDelegate;
@@ -112,19 +111,19 @@ static class PresentationState {
   public SingleViewPresentation(
       Context outerContext,
       Display display,
-      PlatformViewFactory viewFactory,
+      PlatformView view,
       AccessibilityEventsDelegate accessibilityEventsDelegate,
       int viewId,
       Object createParams,
       OnFocusChangeListener focusChangeListener) {
     super(new ImmContext(outerContext), display);
-    this.viewFactory = viewFactory;
     this.accessibilityEventsDelegate = accessibilityEventsDelegate;
     this.viewId = viewId;
     this.createParams = createParams;
     this.focusChangeListener = focusChangeListener;
     this.outerContext = outerContext;
     state = new PresentationState();
+    state.platformView = view;
     getWindow()
         .setFlags(
             WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
@@ -148,7 +147,6 @@ public SingleViewPresentation(
       boolean startFocused) {
     super(new ImmContext(outerContext), display);
     this.accessibilityEventsDelegate = accessibilityEventsDelegate;
-    viewFactory = null;
     this.state = state;
     this.focusChangeListener = focusChangeListener;
     this.outerContext = outerContext;
@@ -178,14 +176,18 @@ protected void onCreate(Bundle savedInstanceState) {
 
     // Our base mContext has already been wrapped with an IMM cache at instantiation time, but
     // we want to wrap it again here to also return state.windowManagerHandler.
-    Context context =
+    Context baseContext =
         new PresentationContext(getContext(), state.windowManagerHandler, outerContext);
 
-    if (state.platformView == null) {
-      state.platformView = viewFactory.create(context, viewId, createParams);
+    View embeddedView = state.platformView.getView();
+    if (embeddedView.getContext() instanceof MutableContextWrapper) {
+      MutableContextWrapper currentContext = (MutableContextWrapper) embeddedView.getContext();
+      currentContext.setBaseContext(baseContext);
+    } else {
+      throw new IllegalStateException(
+          "embedded view context must be a MutableContextWrapper: " + viewId);
     }
 
-    View embeddedView = state.platformView.getView();
     container.addView(embeddedView);
     rootView =
         new AccessibilityDelegatingFrameLayout(

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

@@ -25,7 +25,7 @@ class VirtualDisplayController {
   public static VirtualDisplayController create(
       Context context,
       AccessibilityEventsDelegate accessibilityEventsDelegate,
-      PlatformViewFactory viewFactory,
+      PlatformView view,
       TextureRegistry.SurfaceTextureEntry textureEntry,
       int width,
       int height,
@@ -49,7 +49,7 @@ public static VirtualDisplayController create(
         context,
         accessibilityEventsDelegate,
         virtualDisplay,
-        viewFactory,
+        view,
         surface,
         textureEntry,
         focusChangeListener,
@@ -70,7 +70,7 @@ private VirtualDisplayController(
       Context context,
       AccessibilityEventsDelegate accessibilityEventsDelegate,
       VirtualDisplay virtualDisplay,
-      PlatformViewFactory viewFactory,
+      PlatformView view,
       Surface surface,
       TextureRegistry.SurfaceTextureEntry textureEntry,
       OnFocusChangeListener focusChangeListener,
@@ -87,7 +87,7 @@ private VirtualDisplayController(
         new SingleViewPresentation(
             context,
             this.virtualDisplay.getDisplay(),
-            viewFactory,
+            view,
             accessibilityEventsDelegate,
             viewId,
             createParams,