From 41a841aa8fa27ea671333663cea312be55f0373a Mon Sep 17 00:00:00 2001
From: Simon Lightfoot <simon@devangels.london>
Date: Mon, 17 Jun 2019 16:02:15 +0100
Subject: [PATCH] Native Ad display fix for flutter/flutter#12114

---
 .../platform/SingleViewPresentation.java      | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java b/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
index 7acd66b3b4fc5..b41d9c3a2bbb5 100644
--- a/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
+++ b/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
@@ -29,13 +29,13 @@
  *
  * The view hierarchy for the presentation is as following:
  *
- *          rootView
- *         /         \
- *        /           \
- *       /             \
- *   container       state.fakeWindowViewGroup
- *      |
- *   EmbeddedView
+ *                rootView
+ *                  |
+ *       state.fakeWindowViewGroup
+ *             /            \
+ *   state.container   [other popup views]
+ *         |
+ *    EmbeddedView
  */
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 class SingleViewPresentation extends Presentation {
@@ -55,6 +55,9 @@ static class PresentationState {
 
         // Contains views that were added directly to the window manager (e.g android.widget.PopupWindow).
         private FakeWindowViewGroup fakeWindowViewGroup;
+
+        // Contains the embedded platform view (platformView.getView()) when it is attached to the presentation.
+        private FrameLayout container;
     }
 
     private final PlatformViewFactory viewFactory;
@@ -72,13 +75,13 @@ static class PresentationState {
     // so when we create the platform view we can tell it its view id.
     private Object createParams;
 
-    // The root view for the presentation, it has 2 childs: container which contains the embedded view, and
-    // fakeWindowViewGroup which contains views that were added directly to the presentation's window manager.
+    // The root view for the presentation, it has a single child called fakeWindowViewGroup which contains
+    // views that were added directly to the presentation's window manager. fakeWindowViewGroup's first
+    // child is the state.container which contains the embedded view. So all other views are drawn on-top but
+    // the embedded view itself is not obscured directly by the fakeWindowViewGroup.
+    //
     private AccessibilityDelegatingFrameLayout rootView;
 
-    // Contains the embedded platform view (platformView.getView()) when it is attached to the presentation.
-    private FrameLayout container;
-
     private PresentationState state;
 
     private boolean startFocused = false;
@@ -142,12 +145,17 @@ protected void onCreate(Bundle savedInstanceState) {
         if (state.fakeWindowViewGroup == null) {
             state.fakeWindowViewGroup = new FakeWindowViewGroup(getContext());
         }
+        if (state.container == null) {
+            state.container = new FrameLayout(getContext());
+            final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
+            params.gravity = Gravity.FILL;
+            state.fakeWindowViewGroup.addView(state.container, params);
+        }
         if (state.windowManagerHandler == null) {
             WindowManager windowManagerDelegate = (WindowManager) getContext().getSystemService(WINDOW_SERVICE);
             state.windowManagerHandler = new WindowManagerHandler(windowManagerDelegate, state.fakeWindowViewGroup);
         }
 
-        container = new FrameLayout(getContext());
         PresentationContext context = new PresentationContext(getContext(), state.windowManagerHandler);
 
         if (state.platformView == null) {
@@ -155,9 +163,8 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         View embeddedView = state.platformView.getView();
-        container.addView(embeddedView);
+        state.container.addView(embeddedView);
         rootView = new AccessibilityDelegatingFrameLayout(getContext(), accessibilityEventsDelegate, embeddedView);
-        rootView.addView(container);
         rootView.addView(state.fakeWindowViewGroup);
 
         embeddedView.setOnFocusChangeListener(focusChangeListener);
@@ -171,7 +178,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public PresentationState detachState() {
-        container.removeAllViews();
+        state.container.removeAllViews();
         rootView.removeAllViews();
         return state;
     }