From bcc31461856d508846f2d7b87efc9f2682f6c5b8 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Mon, 21 Oct 2024 07:20:22 -0700 Subject: [PATCH] Delete line referencing v1 string (#157170) This property would previously have been used by https://github.com/flutter/engine/blob/ad9e4fef451a73427285826455db5fbdde502bd7/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java#L59C31-L59C58 but isn't used by the new `FlutterActivityAndFragmentDelegate`. It's also recommended to be removed by the original v1->v2 updating guide: https://github.com/flutter/flutter/blob/master/docs/platforms/android/Upgrading-pre-1.12-Android-projects.md --- .../android_views/android/app/src/main/AndroidManifest.xml | 3 --- .../android/app/src/main/AndroidManifest.xml | 3 --- .../android/app/src/main/AndroidManifest.xml | 7 ------- .../app.tmpl/src/main/AndroidManifest.xml.tmpl | 7 ------- 4 files changed, 20 deletions(-) diff --git a/dev/integration_tests/android_views/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/android_views/android/app/src/main/AndroidManifest.xml index 556f704b78..a73d261d3e 100644 --- a/dev/integration_tests/android_views/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/android_views/android/app/src/main/AndroidManifest.xml @@ -17,9 +17,6 @@ found in the LICENSE file. --> android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - diff --git a/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml index 66db29e84a..618f2bfc86 100644 --- a/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml @@ -17,9 +17,6 @@ found in the LICENSE file. --> android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:exported="true"> - diff --git a/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml index 4729dd2a85..82ac943b3a 100644 --- a/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/release_smoke_test/android/app/src/main/AndroidManifest.xml @@ -21,13 +21,6 @@ found in the LICENSE file. --> android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - - diff --git a/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/AndroidManifest.xml.tmpl b/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/AndroidManifest.xml.tmpl index b5635ff698..b7f06a1536 100644 --- a/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/AndroidManifest.xml.tmpl +++ b/packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/src/main/AndroidManifest.xml.tmpl @@ -19,13 +19,6 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - -