Dispatch platform view touch events to the presentation (flutter#17792)

elancom · Apr 18, 2020 · f13031b · f13031b
1 parent 204adaf
commit f13031b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
@@ -216,7 +216,6 @@ public void onTouch(@NonNull PlatformViewsChannel.PlatformViewTouch touch) {
             throw new IllegalStateException(
                 "Sending touch to an unknown view with id: " + touch.viewId);
           }
-          View view = vdControllers.get(touch.viewId).getView();
 
           MotionEvent event =
               MotionEvent.obtain(
@@ -235,7 +234,7 @@ public void onTouch(@NonNull PlatformViewsChannel.PlatformViewTouch touch) {
                   touch.source,
                   touch.flags);
 
-          view.dispatchTouchEvent(event);
+          vdControllers.get(touch.viewId).dispatchTouchEvent(event);
         }
 
         @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)

diff --git a/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java b/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
@@ -11,6 +11,7 @@
 import android.hardware.display.DisplayManager;
 import android.hardware.display.VirtualDisplay;
 import android.os.Build;
+import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -201,6 +202,12 @@ public View getView() {
     return platformView.getView();
   }
 
+  /** Dispatches a motion event to the presentation for this controller. */
+  public void dispatchTouchEvent(MotionEvent event) {
+    if (presentation == null) return;
+    presentation.dispatchTouchEvent(event);
+  }
+
   @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
   static class OneTimeOnDrawListener implements ViewTreeObserver.OnDrawListener {
     static void schedule(View view, Runnable runnable) {