| commit | 8dcc0ba6cd605ff9de251a80df8228d703cb2927 | [log] [tgz] |
|---|---|---|
| author | Calvin Pan <calvinpan@google.com> | Mon Aug 22 18:18:55 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Aug 22 18:18:55 2022 +0000 |
| tree | 0d7b2420b8ede72a0463c7c07e3f955de46699d1 | |
| parent | 4e19871a4901f14f37d87bccf7b00c4479ea37f8 [diff] | |
| parent | 60a7d5adfacaebca8012030a59bbe99ff6d56ea9 [diff] |
Merge "Avoid running localeconfig change before SDK 17" into androidx-main
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesConfigChangesWithoutLayoutDirectionTestCase.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesConfigChangesWithoutLayoutDirectionTestCase.kt index 20f8505..83239cd 100644 --- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesConfigChangesWithoutLayoutDirectionTestCase.kt +++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesConfigChangesWithoutLayoutDirectionTestCase.kt
@@ -28,7 +28,7 @@ import org.junit.Before import org.junit.Test -@SdkSuppress(maxSdkVersion = 32) +@SdkSuppress(minSdkVersion = 17, maxSdkVersion = 32) class LocalesConfigChangesWithoutLayoutDirectionTestCase { private lateinit var scenario: ActivityScenario< LocalesConfigChangesActivityWithoutLayoutDirection>
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesCustomAttachBaseContextTestCase.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesCustomAttachBaseContextTestCase.kt index 45593fbe..bece087 100644 --- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesCustomAttachBaseContextTestCase.kt +++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesCustomAttachBaseContextTestCase.kt
@@ -34,7 +34,7 @@ import org.junit.Test @LargeTest -@SdkSuppress(maxSdkVersion = 32) +@SdkSuppress(minSdkVersion = 17, maxSdkVersion = 32) class LocalesCustomAttachBaseContextTestCase() { @get:Rule