Add integration test for cutout rotation evaluation #160354

reidbaker · 2024-12-16T16:29:32Z

Test that the position of a cutout as reported by the Android engine repositions based on screen orientation.

Related to flutter/engine#55992

Part of #155658

to test run flutter drive integration_test/display_cutout_test.dart
from dev/integration_tests/display_cutout_rotation

Pr also force upgrades pub dependencies because I was getting presubmit failure in version solve.

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
All existing and new tests are passing.

gmackall · 2024-12-18T18:48:46Z

dev/integration_tests/display_cutout_rotation/.metadata

+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35
+      base_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35
+    - platform: android
+      create_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35
+      base_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35


Doesn't matter for this pr, but do you know where this .metadata file comes from? Should we remove the output for the flutter migrate command, given that it is probably not going to land at any point?

I do not. I should talk to @jmagman about if we should pick the migration work back up.

Also sorry I hit "single comment" instead of start review, more comments coming in a moment

gmackall

Mostly lgtm, added some comments

dev/integration_tests/display_cutout_rotation/README.md

gmackall · 2024-12-18T18:55:44Z

...utout_rotation/android/app/src/main/java/com/example/display_cutout_rotation/MainActivity.kt

+        // engine, the test app must request that it be allowed to draw its content behind cutouts.
+        // See
+        // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#layoutInDisplayCutoutMode
+        if (Build.VERSION.SDK_INT >= 30) {


I'm confused by the comment above and then this check.

Should the check not be if (Build.VERSION.SDK_INT <= 34), if we need to trigger this on API 34 and below? Or do I misunderstand what the check is doing here

Added more exposition explaining what is happening here.

gmackall · 2024-12-18T19:02:20Z

dev/integration_tests/display_cutout_rotation/.metadata

+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35
+      base_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35
+    - platform: android
+      create_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35
+      base_revision: 0dc4eb31df6fe16c1bac10bef3904eb378056c35


Also sorry I hit "single comment" instead of start review, more comments coming in a moment

dev/integration_tests/display_cutout_rotation/test_driver/display_cutout_test_test.dart

dev/integration_tests/display_cutout_rotation/README.md

matanlurey · 2024-12-18T22:21:11Z

dev/integration_tests/display_cutout_rotation/analysis_options.yaml

I think we want to remove this and inherit from the root instead.

I ended up copying the version we use in flutter gallery which includes a repo wide set of options.

...utout_rotation/android/app/src/main/java/com/example/display_cutout_rotation/MainActivity.kt

matanlurey · 2024-12-18T22:22:23Z

...utout_rotation/android/app/src/main/java/com/example/display_cutout_rotation/MainActivity.kt

+        val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+        windowInsetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
+        actionBar?.hide()


Should this be actionBar!.hide()? Why is it sometimes null?

actionBar is a shorthand for getActionBar on the Activity class which is nullable.

FWIW I dont expect we ever have an action bar so I have removed this line of code.

Did you update the PR? I still see it.

Sorry expired github token, confirmed pushed now

matanlurey · 2024-12-18T22:22:39Z

...utout_rotation/android/app/src/main/java/com/example/display_cutout_rotation/MainActivity.kt

+        // engine, the test app must request that it be allowed to draw its content behind cutouts.
+        // See
+        // https://developer.android.com/reference/android/view/WindowManager.LayoutParams#layoutInDisplayCutoutMode
+        if (Build.VERSION.SDK_INT >= 30) {


matanlurey · 2024-12-18T22:28:00Z

dev/integration_tests/display_cutout_rotation/lib/main.dart

+class _MyAppState extends State<MyApp> {
+  @override
+  Widget build(BuildContext context) {
+    final List<DisplayFeature> displayFeatures =


Let's move the getCutouts feature into this lib/ and re-use it instead of having two copies.

I didnt do this. It is 2 lines.

dev/integration_tests/display_cutout_rotation/test_driver/display_cutout_test_test.dart

matanlurey

LGTM

auto-submit · 2025-01-17T17:01:17Z

auto label is removed for flutter/flutter/160354, due to - The status or check suite Windows framework_tests_libraries has failed. Please fix the issues identified (or deflake) before re-applying this label.

…flutter#160354)

Manual roll requested by [email protected] flutter/flutter@c1561a4...c1ffaa9 2025-01-24 [email protected] Fix link to hotfix documentation best practices (flutter/flutter#162116) 2025-01-24 [email protected] Add integration test for cutout rotation evaluation (flutter/flutter#160354) 2025-01-24 [email protected] Reland "[Impeller] Migrate unit tests off of Skia geometry classes (#161855)" (flutter/flutter#162146) 2025-01-24 [email protected] Fix TextField intrinsic width when hint is not visible (flutter/flutter#161235) 2025-01-24 [email protected] When parsing flavors, handle Xcode build configurations that are not lowercase (flutter/flutter#161455) 2025-01-24 [email protected] [Impeller] Fix source offset in PathBuilder::AddPath (flutter/flutter#162052) 2025-01-24 [email protected] Add to Setup Path Example to Engine README (flutter/flutter#162115) 2025-01-23 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Unskip test. (#162106)" (flutter/flutter#162122) 2025-01-23 [email protected] feat: Add `hint` (Widget) property to InputDecoration (flutter/flutter#161424) 2025-01-23 [email protected] Fix skwasm target in wasm_debug_unopt build. (flutter/flutter#162100) 2025-01-23 [email protected] Marks Linux_android_emu android views to be unflaky (flutter/flutter#160493) 2025-01-23 [email protected] Unskip test. (flutter/flutter#162106) 2025-01-23 [email protected] Add ability to maintain bottom view padding in `NavigationBar` safe area (flutter/flutter#162076) 2025-01-23 [email protected] Roll pub packages (flutter/flutter#162095) 2025-01-23 [email protected] Delete an unused (manual) workflow, added missing copyright headers. (flutter/flutter#162050) 2025-01-23 [email protected] Android templates: update default Kotlin from 1.8.22 to 2.1.0, update default Gradle from 8.9 to 8.12 (flutter/flutter#160974) 2025-01-23 [email protected] flutter_tools: flutter_tester is a host artifact (flutter/flutter#162047) 2025-01-23 [email protected] [Impeller] Make glIsTexture mockable for use by the ReactorGLES.NameUntrackedHandle test (flutter/flutter#162082) 2025-01-23 [email protected] Remove "Mac Designed for iPad" as a discoverable `flutter run` device (flutter/flutter#161459) 2025-01-23 [email protected] Show error on macOS if missing Local Network permissions (flutter/flutter#161846) 2025-01-23 [email protected] Autocomplete keyboard navigation (flutter/flutter#159455) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…flutter#160354)

) Manual roll requested by [email protected] flutter/flutter@c1561a4...c1ffaa9 2025-01-24 [email protected] Fix link to hotfix documentation best practices (flutter/flutter#162116) 2025-01-24 [email protected] Add integration test for cutout rotation evaluation (flutter/flutter#160354) 2025-01-24 [email protected] Reland "[Impeller] Migrate unit tests off of Skia geometry classes (#161855)" (flutter/flutter#162146) 2025-01-24 [email protected] Fix TextField intrinsic width when hint is not visible (flutter/flutter#161235) 2025-01-24 [email protected] When parsing flavors, handle Xcode build configurations that are not lowercase (flutter/flutter#161455) 2025-01-24 [email protected] [Impeller] Fix source offset in PathBuilder::AddPath (flutter/flutter#162052) 2025-01-24 [email protected] Add to Setup Path Example to Engine README (flutter/flutter#162115) 2025-01-23 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Unskip test. (#162106)" (flutter/flutter#162122) 2025-01-23 [email protected] feat: Add `hint` (Widget) property to InputDecoration (flutter/flutter#161424) 2025-01-23 [email protected] Fix skwasm target in wasm_debug_unopt build. (flutter/flutter#162100) 2025-01-23 [email protected] Marks Linux_android_emu android views to be unflaky (flutter/flutter#160493) 2025-01-23 [email protected] Unskip test. (flutter/flutter#162106) 2025-01-23 [email protected] Add ability to maintain bottom view padding in `NavigationBar` safe area (flutter/flutter#162076) 2025-01-23 [email protected] Roll pub packages (flutter/flutter#162095) 2025-01-23 [email protected] Delete an unused (manual) workflow, added missing copyright headers. (flutter/flutter#162050) 2025-01-23 [email protected] Android templates: update default Kotlin from 1.8.22 to 2.1.0, update default Gradle from 8.9 to 8.12 (flutter/flutter#160974) 2025-01-23 [email protected] flutter_tools: flutter_tester is a host artifact (flutter/flutter#162047) 2025-01-23 [email protected] [Impeller] Make glIsTexture mockable for use by the ReactorGLES.NameUntrackedHandle test (flutter/flutter#162082) 2025-01-23 [email protected] Remove "Mac Designed for iPad" as a discoverable `flutter run` device (flutter/flutter#161459) 2025-01-23 [email protected] Show error on macOS if missing Local Network permissions (flutter/flutter#161846) 2025-01-23 [email protected] Autocomplete keyboard navigation (flutter/flutter#159455) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

Add integration test for cutout rotation evaluation

4d14b47

reidbaker requested review from a team, gmackall and matanlurey December 16, 2024 16:29

reidbaker added 5 commits December 16, 2024 11:51

Add flutter_driver dependency

a7d49f2

kt format

b50ed57

Copyright addition

9ef18ea

remove time based delays

50b8e53

Merge branch 'master' into i155658-cla-clean-rotation-patch

6631e56

reidbaker mentioned this pull request Dec 16, 2024

[CP-stable]Move detection of cutouts in Android engine to onApplyWindowInsets flutter/engine#56379

Merged

5 tasks

reidbaker added 3 commits December 16, 2024 15:23

copyright changes

195108e

Merge branch 'master' into i155658-cla-clean-rotation-patch

c47cfc9

Update pub dependencies

c0f5518

reidbaker mentioned this pull request Dec 17, 2024

Exclude .cxx folders from git as part of the flutter create templates. #160372

Closed

force update dependencies

5da77a2

Merge branch 'master' into i155658-cla-clean-rotation-patch

ac884e1

gmackall reviewed Dec 18, 2024

View reviewed changes

matanlurey requested changes Dec 18, 2024

View reviewed changes

Code review feedback

0f1387f

matanlurey approved these changes Dec 19, 2024

View reviewed changes

dart analyze

67cc624

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 17, 2025

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 17, 2025

Merge branch 'master' into i155658-cla-clean-rotation-patch

21591b2

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 24, 2025

auto-submit bot added this pull request to the merge queue Jan 24, 2025

Merged via the queue into flutter:master with commit 02e11f9 Jan 24, 2025
175 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 24, 2025

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Roll Flutter from c1561a41c530 to 02e11f95a18a (20 revisions) flutter/packages#8496

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 24, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

6b60ca5

…flutter#160354)

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Roll Flutter from c1561a41c530 to c1ffaa9d9deb (21 revisions) flutter/packages#8497

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 24, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

56cb835

…flutter#160354)

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Manual roll Flutter from c1561a41c530 to c1ffaa9d9deb (21 revisions) flutter/packages#8498

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 24, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

42f04fb

…flutter#160354)

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Roll Flutter from c1561a41c530 to c1ffaa9d9deb (21 revisions) flutter/packages#8500

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 24, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

b3df0a7

…flutter#160354)

matanlurey mentioned this pull request Feb 3, 2025

Exclude dev/integration_tests/display_cutout_rotation/android/app/build.gradle.kts from lock file creation #162614

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

032bcb5

…flutter#160354)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

6892bfb

…flutter#160354)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 21, 2025

02e11f9 Add integration test for cutout rotation evaluation (flutter/…

ed896c8

…flutter#160354)

Add integration test for cutout rotation evaluation #160354

Add integration test for cutout rotation evaluation #160354

Uh oh!

Conversation

reidbaker commented Dec 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gmackall left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

matanlurey left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Jan 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

reidbaker commented Dec 16, 2024 •

edited

Loading