Change visibility of FlutterView when onStop/onStart

Author: haoan.zzj

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

@@ -388,7 +388,7 @@ void onStart() {
     Log.v(TAG, "onStart()");
     ensureAlive();
     doInitialFlutterViewRun();
-    flutterView.onStart();
+    flutterView.setVisibility(View.VISIBLE);
   }
 
   /**
@@ -575,7 +575,7 @@ void onStop() {
     Log.v(TAG, "onStop()");
     ensureAlive();
     flutterEngine.getLifecycleChannel().appIsPaused();
-    flutterView.onStop();
+    flutterView.setVisibility(View.GONE);
   }
 
   /**

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

@@ -1420,20 +1420,6 @@ public void autofill(SparseArray<AutofillValue> values) {
     textInputPlugin.autofill(values);
   }
 
-  // Invoke this from {@code FlutterActivityAndFragmentDelegate#onStart()}
-  /* package */ void onStart() {
-    if (flutterSurfaceView != null) {
-      flutterSurfaceView.setVisibility(View.VISIBLE);
-    }
-  }
-
-  // Invoke this from {@code FlutterActivityAndFragmentDelegate#onStop()}
-  /* package */ void onStop() {
-    if (flutterSurfaceView != null) {
-      flutterSurfaceView.setVisibility(View.GONE);
-    }
-  }
-
   /**
    * Listener that is notified when a {@link io.flutter.embedding.engine.FlutterEngine} is attached
    * to/detached from a given {@code FlutterView}.

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

@@ -21,6 +21,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
+import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.Lifecycle;
 import io.flutter.FlutterInjector;
@@ -984,21 +985,23 @@ public void itThrowsWhenDelayingTheFirstDrawAndUsingATextureView() {
   }
 
   @Test
-  public void itNotifiesFlutterViewWhenOnStartAndOnStop() {
+  public void itChangesFlutterViewVisibilityWhenOnStartAndOnStop() {
     // ---- Test setup ----
     // Create the real object that we're testing.
     FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost);
 
     // --- Execute the behavior under test ---
     delegate.onAttach(RuntimeEnvironment.application);
     delegate.onCreateView(null, null, null, 0, true);
-    delegate.flutterView = mock(FlutterView.class);
     delegate.onStart();
-    // Verify that the onStart of flutterView was called.
-    verify(delegate.flutterView, times(1)).onStart();
+    // Verify that the flutterView is visible.
+    assertEquals(View.VISIBLE, delegate.flutterView.getVisibility());
     delegate.onStop();
-    // Verify that the onStop of flutterView was called.
-    verify(delegate.flutterView, times(1)).onStop();
+    // Verify that the flutterView is not visible.
+    assertEquals(View.GONE, delegate.flutterView.getVisibility());
+    delegate.onStart();
+    // Verify that the flutterView is visible.
+    assertEquals(View.VISIBLE, delegate.flutterView.getVisibility());
   }
 
   @Test

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

@@ -687,18 +687,6 @@ public void itRegistersAndUnregistersToWindowManager() {
     verify(windowInfoRepo, times(1)).removeWindowLayoutInfoListener(any());
   }
 
-  @Test
-  public void itChangesSurfaceViewVisibilityWhenOnStartAndOnStop() {
-    Context context = Robolectric.setupActivity(Activity.class);
-    FlutterView flutterView = spy(new FlutterView(context));
-    FlutterSurfaceView flutterSurfaceView = (FlutterSurfaceView) flutterView.renderSurface;
-    assertEquals(View.VISIBLE, flutterSurfaceView.getVisibility());
-    flutterView.onStop();
-    assertEquals(View.GONE, flutterSurfaceView.getVisibility());
-    flutterView.onStart();
-    assertEquals(View.VISIBLE, flutterSurfaceView.getVisibility());
-  }
-
   @Test
   public void itSendsHingeDisplayFeatureToFlutter() {
     Context context = Robolectric.setupActivity(Activity.class);