From a9ae777f4e9dae8e1146eff6aeac66fab2db4fde Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 14 Feb 2024 13:54:58 -0800 Subject: [PATCH 1/2] Try making all test activities full-screen. --- .../scenarios/TestableFlutterActivity.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java index 82ba2d95c5abd..4c4bd77fd63bd 100644 --- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java +++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java @@ -4,7 +4,12 @@ package dev.flutter.scenarios; +import android.os.Bundle; +import android.view.WindowManager; + import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import java.util.concurrent.atomic.AtomicBoolean; @@ -22,6 +27,20 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { .setMessageHandler("take_screenshot", (byteBuffer, binaryReply) -> notifyFlutterRendered()); } + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // On newer versions of Android, this is the default. Because these tests are being used to take + // screenshots on Skia Gold, we don't want any of the System UI to show up, even for older API + // versions (i.e. 28). + // + // See also: + // https://github.com/flutter/engine/blob/a9081cce1f0dd730577a36ee1ca6d7af5cdc5a9b/shell/platform/android/io/flutter/embedding/android/FlutterView.java#L696 + // https://github.com/flutter/flutter/issues/143471 + getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + protected void notifyFlutterRendered() { synchronized (flutterUiRenderedLock) { isScenarioReady.set(true); From d622d87353fb8b35cd0ab37baa6f416db3279964 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 14 Feb 2024 13:55:15 -0800 Subject: [PATCH 2/2] ++ --- .../java/dev/flutter/scenarios/TestableFlutterActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java index 4c4bd77fd63bd..e1a1c98735523 100644 --- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java +++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestableFlutterActivity.java @@ -6,10 +6,8 @@ import android.os.Bundle; import android.view.WindowManager; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import java.util.concurrent.atomic.AtomicBoolean;