From 02ce5f1fddbe7635ca68bc082c23b8be07cd0e8a Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:04:39 -0700 Subject: [PATCH 1/7] Update AndroidManifest.xml --- shell/platform/android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/AndroidManifest.xml b/shell/platform/android/AndroidManifest.xml index 5fbd0d8553c2b..675a378733a10 100644 --- a/shell/platform/android/AndroidManifest.xml +++ b/shell/platform/android/AndroidManifest.xml @@ -5,7 +5,7 @@ --> - + From 6a3f03204373d554bed70aad4d69e1dafdbfc5ad Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:05:28 -0700 Subject: [PATCH 2/7] Update build.gradle --- testing/android_background_image/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle index c7346c23e8422..4c39c2ac3ce6d 100644 --- a/testing/android_background_image/android/app/build.gradle +++ b/testing/android_background_image/android/app/build.gradle @@ -24,7 +24,7 @@ android { } defaultConfig { applicationId 'dev.flutter.android_background_image' - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName '1.0' From 3806d576f5d2c0b3e904e7ed152322c693877880 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:06:13 -0700 Subject: [PATCH 3/7] Update build.gradle --- testing/scenario_app/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index 5f2a94523b996..647dd220ef4c3 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -26,7 +26,7 @@ android { } defaultConfig { applicationId 'dev.flutter.scenarios' - minSdkVersion 18 + minSdkVersion 19 targetSdkVersion 33 versionCode 1 versionName '1.0' From 14453374822b8d7fd59360b3e689bc121dbdbc7e Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 19 Jul 2023 11:06:33 -0700 Subject: [PATCH 4/7] Update build.gradle --- shell/platform/android/test_runner/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 5fd37ad3edb6f..589c74ff34e77 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -36,7 +36,7 @@ android { compileSdkVersion 33 defaultConfig { - minSdkVersion 16 + minSdkVersion 19 } compileOptions { From 0d4eddba8ffad3764f2a2712e91105bed0df3b75 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 20 Jul 2023 13:16:11 -0700 Subject: [PATCH 5/7] Change jelly bean minSdk values in FlutterActivityTest.java to kitkat --- .../test/io/flutter/embedding/android/FlutterActivityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java index d2992e656559b..ec6fe4ff87b82 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java @@ -574,7 +574,7 @@ public void itWithMetadataWithoutSplashScreenResourceKeyDoesNotProvideSplashScre } @Test - @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.P) + @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.P) public void fullyDrawn_beforeAndroidQ() { Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx); ActivityController activityController = From 0b1353f4fb9b5f22a2a2aa5d339dba25f0e88585 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 20 Jul 2023 13:18:38 -0700 Subject: [PATCH 6/7] Change jelly bean minSdk values in LocalizationPluginTest.java to kitkat --- .../plugin/localization/LocalizationPluginTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java index a1e8a12716816..6afa97bdf17cc 100644 --- a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java @@ -238,7 +238,7 @@ public void computePlatformResolvedLocale_fromAndroidN() { // Tests the legacy pre API 24 algorithm. @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "es-rMX") public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() { @@ -252,7 +252,7 @@ public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() } @Test - @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.M, qualifiers = "") + @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "") public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_beforeAndroidN() { FlutterJNI flutterJNI = new FlutterJNI(); DartExecutor dartExecutor = mock(DartExecutor.class); @@ -273,7 +273,7 @@ public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_bef @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "fr-rCH") public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_beforeAndroidN() { @@ -299,7 +299,7 @@ public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_befo @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "it-rIT") public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN() { @@ -325,7 +325,7 @@ public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN( @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "fr-rCH") public void computePlatformResolvedLocale_selectOnlyLanguageLocale_beforeAndroidN() { From c8ab8c914d4606e965b8f61bde41d514306f7332 Mon Sep 17 00:00:00 2001 From: gmackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 20 Jul 2023 13:20:44 -0700 Subject: [PATCH 7/7] Change jelly bean minSdk values in SingleViewPresentation.java to kitkat --- .../flutter/plugin/platform/SingleViewPresentationTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java index 2cc177fd86648..78955fcaddd1b 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java @@ -1,6 +1,6 @@ package io.flutter.plugin.platform; -import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; +import static android.os.Build.VERSION_CODES.KITKAT; import static android.os.Build.VERSION_CODES.P; import static android.os.Build.VERSION_CODES.R; import static junit.framework.Assert.assertEquals; @@ -24,7 +24,7 @@ @TargetApi(P) public class SingleViewPresentationTest { @Test - @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R) + @Config(minSdk = KITKAT, maxSdk = R) public void returnsOuterContextInputMethodManager() { // There's a bug in Android Q caused by the IMM being instanced per display. // https://github.com/flutter/flutter/issues/38375. We need the context returned by @@ -55,7 +55,7 @@ public void returnsOuterContextInputMethodManager() { } @Test - @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R) + @Config(minSdk = KITKAT, maxSdk = R) public void returnsOuterContextInputMethodManager_createDisplayContext() { // The IMM should also persist across display contexts created from the base context.