From ffe1e7fa23ebcace035ff37c61beca4c8284c433 Mon Sep 17 00:00:00 2001 From: Yaakov Schectman Date: Wed, 6 Nov 2024 16:27:29 -0500 Subject: [PATCH] Enable overlay before flutter drive --- .../run_flutter_driver_android_tests.dart | 22 +++++++++++++++++++ .../display_cutout_rotation_main_test.dart | 14 ------------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dev/bots/suite_runners/run_flutter_driver_android_tests.dart b/dev/bots/suite_runners/run_flutter_driver_android_tests.dart index 13ad90ad5a1..254e14ef37b 100644 --- a/dev/bots/suite_runners/run_flutter_driver_android_tests.dart +++ b/dev/bots/suite_runners/run_flutter_driver_android_tests.dart @@ -80,6 +80,28 @@ Future runFlutterDriverAndroidTests() async { ), ); + // A simulated cutout overlay is necessary to test display_cutout_rotation. + await runCommand( + 'adb', + [ + 'shell', + 'settings', + 'put', + 'global', + 'development_settings_enabled', + '1', + ], + ); + await runCommand( + 'adb', + [ + 'shell', + 'cmd', + 'overlay', + 'enable', + 'com.android.internal.display.cutout.emulation.tall', + ], + ); await runCommand( 'flutter', [ diff --git a/dev/integration_tests/native_driver_test/test_driver/display_cutout_rotation_main_test.dart b/dev/integration_tests/native_driver_test/test_driver/display_cutout_rotation_main_test.dart index 3a2dda94288..a5fd870cc84 100644 --- a/dev/integration_tests/native_driver_test/test_driver/display_cutout_rotation_main_test.dart +++ b/dev/integration_tests/native_driver_test/test_driver/display_cutout_rotation_main_test.dart @@ -8,8 +8,6 @@ import 'package:flutter_driver/flutter_driver.dart'; import 'package:native_driver/native_driver.dart'; import 'package:test/test.dart'; -const String _tallCutout = 'com.android.internal.display.cutout.emulation.tall'; - void main() async { late final FlutterDriver flutterDriver; late final NativeDriver nativeDriver; @@ -18,18 +16,6 @@ void main() async { flutterDriver = await FlutterDriver.connect(); nativeDriver = await AndroidNativeDriver.connect(flutterDriver); await flutterDriver.waitUntilFirstFrameRasterized(); - // Enable developer settings in order to simulate a cutout. - await Process.run('adb', [ - 'shell', - 'settings', - 'put', - 'global', - 'development_settings_enabled', - '1' - ]); - // Simulate the tall cutout. A singular cutout that aligns to the "top" of the display. - await Process.run( - 'adb', ['shell', 'cmd', 'overlay', 'enable', _tallCutout]); }); tearDownAll(() async {