diff --git a/.github/workflows/flix_sample.yml b/.github/workflows/flix_sample.yml index b5554d694..bd6180b8a 100644 --- a/.github/workflows/flix_sample.yml +++ b/.github/workflows/flix_sample.yml @@ -61,12 +61,19 @@ jobs: - name: Create AVD id: create - uses: ndtp/android-avd-manager-action@main + uses: ndtp/android-avd-manager-action@2.0 with: - api-level: 29 - target: google_apis + # 37.0 and 37.1 both crash-loop SurfaceFlinger: mapper.ranchu.so + # aborts on `!hasReadColorBufferDma`, taking system_server with it. + # 37.2-beta3 is the first image where that is fixed -- it carries a + # DEV-branch build, so the fix has not reached a release image yet. + api-level: '37.2-beta3' + target: google_apis_ps16k + channel: beta arch: x86_64 profile: pixel_3a + ram-size: 4096M + disk-size: 6G - name: Enable kernel-based virtual machine (KVM) uses: ndtp/enable-kvm-action@v1 @@ -78,6 +85,14 @@ jobs: emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim verbose: true + - name: Wait for the device to settle + run: | + # sys.boot_completed goes high while PackageManager is still doing + # first-boot work, so wait for the package service to actually answer. + timeout 240 bash -c 'until adb shell service check package | grep -q ": found"; do sleep 2; done' + echo "Host disk:"; df -h / + echo "Guest /data:"; adb shell df -h /data + - name: Download app apk uses: actions/download-artifact@v4 with: diff --git a/Ext/Ktx/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/test.png b/Ext/Ktx/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/test.png similarity index 100% rename from Ext/Ktx/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/test.png rename to Ext/Ktx/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/test.png diff --git a/Library/README.md b/Library/README.md new file mode 100644 index 000000000..e35a730e8 --- /dev/null +++ b/Library/README.md @@ -0,0 +1,106 @@ +# Testify — Core Library + +`dev.testify:testify` is the core runtime of Android Testify. It extends +[Android instrumentation tests](https://developer.android.com/training/testing/instrumented-tests) +with screenshot assertions: the library captures a bitmap of an `Activity` or `View` after all +layout and draw passes have completed, then compares that capture against a baseline image checked +into your source tree. When the rendering changes, the test fails and reports the difference. + +Because screenshot tests are ordinary instrumented tests, they run on emulators and physical +devices from Android Studio, from the Gradle command line, and on continuous integration, and they +integrate with existing JUnit4 and Espresso test suites. + +## Core use cases + +- **Assert UI rendering.** Add `ScreenshotScenarioRule` (used with `ActivityScenario`) or the + legacy `ScreenshotRule` to a test class, annotate each test method with + `@ScreenshotInstrumentation`, and call `assertSame()`. +- **Capture a subset of the screen.** Target a specific view with a view provider or root view ID + instead of capturing the full `Activity`. +- **Vary the device configuration.** Set locale, font scale, and orientation per test to verify + localization, accessibility text sizes, and rotation without maintaining separate test suites. +- **Control comparison.** Apply an exactness tolerance, exclude regions from the comparison, or + supply a custom compare method for cases where an exact pixel match is not appropriate. +- **Stabilize captures.** Suppress sources of nondeterminism — text cursors, scrollbars, password + reveal, text suggestions, and the soft keyboard — and select an alternate capture method such as + `PixelCopy` or software rendering. +- **Diagnose failures.** Enable high-contrast diff images and YAML run reports through + `TestifyFeatures` to identify which pixels changed. + +> [!NOTE] +> This README covers the library itself. For installation, tutorials, and task-oriented guides — +> including the [**Recipes**](https://testify.dev/docs/category/recipes) section, which documents +> the scenarios listed above step by step — see [testify.dev](https://testify.dev). + +## Building + +The library is built from the repository root with the Gradle wrapper. It depends on the `:Ktx` +module, so build it through the root project rather than in isolation. + +- Build the debug variant: + ``` + ./gradlew :Library:assembleDebug + ``` + +- Build the release AAR (written to `Library/build/outputs/aar/`): + ``` + ./gradlew :Library:assembleRelease + ``` + +- Publish to the local Maven repository for use by a consuming project: + ``` + ./gradlew :Library:publishToMavenLocal + ``` + +Building requires JDK 25. Warnings are treated as errors in this module, so any new compiler +warning fails the build. + +## Testing + +The Testify core library is expected to pass KtLint checks, junit unit tests, and Android instrumented tests. + +- To run the KtLint linter: + ``` + ./gradlew Library:ktlintCheck + ``` + +- To run the junit tests: + ``` + ./gradlew Library:testDebugUnitTest + ``` + +- To run the Android instrumented tests: + ``` + ./gradlew Library:connectedDebugAndroidTest + ``` + +Instrumented tests require a connected device or a running emulator. They exercise the capture and +comparison pipeline against baseline images stored in `src/androidTest/assets/screenshots/`, which +are grouped by device characteristics, so results depend on the API level, resolution, density, and +locale of the target device. + + +# License + + MIT License + + Modified work copyright (c) 2022-2026 ndtp + Original work copyright (c) 2021 Shopify + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/Library/build.gradle b/Library/build.gradle index 4ba8d9899..4c84feddb 100644 --- a/Library/build.gradle +++ b/Library/build.gradle @@ -30,7 +30,7 @@ base { archivesName = pom.artifact } -jacoco { toolVersion = "0.8.10" } +jacoco { toolVersion = "0.8.15" } android { compileOptions { diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withPixelCopy.png b/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withPixelCopy.png deleted file mode 100644 index 7d4889292..000000000 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withPixelCopy.png and /dev/null differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withoutPixelCopy.png b/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withoutPixelCopy.png deleted file mode 100644 index 74d9388b1..000000000 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withoutPixelCopy.png and /dev/null differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/testing.png b/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/testing.png deleted file mode 100644 index d8f2e9afc..000000000 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/testing.png and /dev/null differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AssertExpectedDeviceTest_testExpectedDevice.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AssertExpectedDeviceTest_testExpectedDevice.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AssertExpectedDeviceTest_testExpectedDevice.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AssertExpectedDeviceTest_testExpectedDevice.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AssertExpectedDeviceTest_testExpectedDevice.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AssertExpectedDeviceTest_testExpectedDevice.png differ diff --git a/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withPixelCopy.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withPixelCopy.png new file mode 100644 index 000000000..e65f9325c Binary files /dev/null and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withPixelCopy.png differ diff --git a/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withoutPixelCopy.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withoutPixelCopy.png new file mode 100644 index 000000000..1ffe3487e Binary files /dev/null and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ExperimentalPixelCopyTest_withoutPixelCopy.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/Fuzzy_225.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/Fuzzy_225.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/Fuzzy_225.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/Fuzzy_225.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/Fuzzy_237.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/Fuzzy_237.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/Fuzzy_237.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/Fuzzy_237.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod1.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod1.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod1.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod1.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod1.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod1.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod2.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod2.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod2.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod2.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod2.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod2.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod5.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod5.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod5.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod5.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod5.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/RuleLifecycleTest_testMethod5.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testExpectedDevice.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testExpectedDevice.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testExpectedDevice.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testExpectedDevice.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testExpectedDevice.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testExpectedDevice.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testMissingBaselineRecordMode.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testMissingBaselineRecordMode.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testMissingBaselineRecordMode.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testMissingBaselineRecordMode.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testMissingBaselineRecordMode.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleAssertExpectedDeviceTest_testMissingBaselineRecordMode.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleLifecycleTest_default.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleLifecycleTest_default.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleLifecycleTest_default.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleLifecycleTest_default.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleLifecycleTest_default.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleLifecycleTest_default.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_fontScale.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_fontScale.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_fontScale.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_fontScale.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_testPortrait.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_testPortrait.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_testPortrait.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_testPortrait.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_testPortrait.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioRuleOrientationTest_testPortrait.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod1.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod1.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod1.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod1.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod1.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod1.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod2.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod2.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod2.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod2.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod2.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod2.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod5.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod5.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod5.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod5.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod5.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTestRuleLifecycleTest_testMethod5.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTest_alt.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTest_alt.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTest_alt.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTest_alt.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTest_default.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTest_default.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioTest_default.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioTest_default.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testAnnotationRequired.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testAnnotationRequired.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testAnnotationRequired.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testAnnotationRequired.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testAnnotationRequired.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testAnnotationRequired.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testNoScreenshotAnnotationRequired.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testNoScreenshotAnnotationRequired.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testNoScreenshotAnnotationRequired.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotAnnotationTest_testNoScreenshotAnnotationRequired.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotInstrumentationOrientationTest_testPortraitOnly.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotInstrumentationOrientationTest_testPortraitOnly.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotInstrumentationOrientationTest_testPortraitOnly.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotInstrumentationOrientationTest_testPortraitOnly.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotInstrumentationOrientationTest_testPortraitOnly.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotInstrumentationOrientationTest_testPortraitOnly.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleLifecycleTest_default.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleLifecycleTest_default.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleLifecycleTest_default.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleLifecycleTest_default.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleLifecycleTest_default.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleLifecycleTest_default.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleDefaultTest_default.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleDefaultTest_default.png similarity index 53% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleDefaultTest_default.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleDefaultTest_default.png index f434f0abc..057564744 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleDefaultTest_default.png and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleDefaultTest_default.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleLifecycleTest_default.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleLifecycleTest_default.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleLifecycleTest_default.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleLifecycleTest_default.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/benchmark_baseline.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/benchmark_baseline.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/benchmark_baseline.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/benchmark_baseline.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/benchmark_current.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/benchmark_current.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/benchmark_current.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/benchmark_current.png diff --git a/Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/test.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/test.png similarity index 100% rename from Library/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/test.png rename to Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/test.png diff --git a/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/testing.png b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/testing.png new file mode 100644 index 000000000..51260da7c Binary files /dev/null and b/Library/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/testing.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScenarioRuleOrientationTest_testLandscape.png b/Library/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScenarioRuleOrientationTest_testLandscape.png similarity index 55% rename from Library/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScenarioRuleOrientationTest_testLandscape.png rename to Library/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScenarioRuleOrientationTest_testLandscape.png index 4628053a3..aba446913 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScenarioRuleOrientationTest_testLandscape.png and b/Library/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScenarioRuleOrientationTest_testLandscape.png differ diff --git a/Library/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotInstrumentationOrientationTest_testLandscapeOnly.png b/Library/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotInstrumentationOrientationTest_testLandscapeOnly.png similarity index 55% rename from Library/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotInstrumentationOrientationTest_testLandscapeOnly.png rename to Library/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotInstrumentationOrientationTest_testLandscapeOnly.png index 4628053a3..aba446913 100644 Binary files a/Library/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotInstrumentationOrientationTest_testLandscapeOnly.png and b/Library/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotInstrumentationOrientationTest_testLandscapeOnly.png differ diff --git a/Library/src/androidTest/java/dev/testify/AssertExpectedDeviceTest.kt b/Library/src/androidTest/java/dev/testify/AssertExpectedDeviceTest.kt index 775c17adb..b1529e7cd 100644 --- a/Library/src/androidTest/java/dev/testify/AssertExpectedDeviceTest.kt +++ b/Library/src/androidTest/java/dev/testify/AssertExpectedDeviceTest.kt @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2023 ndtp + * Copyright (c) 2026 ndtp * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -42,8 +42,10 @@ class AssertExpectedDeviceTest { /** * WHEN the baseline image matches the current device settings THEN success * - * The baseline was recorded against a Pixel 3a (1080x2220 440dpi) running Q API level 29, x86, Android 10.0 (Google APIs) - * key = 29-1080x2220@440dp-en_US + * The baseline was recorded against a Pixel 3a (1080x2220 440dpi) running 16 KB Page Size Google + * APIs ARM 64 v8a System Image, API 37.0 (CinnamonBun; Android 17.0) + * + * key = 37-1080x2220@440dp-en_US * * https://testify.dev/docs/get-started/configuring-an-emulator */ @@ -87,7 +89,7 @@ class AssertExpectedDeviceTest { val e = assertThrows(UnexpectedDeviceException::class.java, rule::assertSame) assertTrue( e.message!!.contains( - "The currently running device '29-1080x2220@440dp-en_US'" + + "The currently running device '37-1080x2220@440dp-en_US'" + " does not match the expected device '33-1080x1920@395dp-en_CA'" ) ) diff --git a/Library/src/androidTest/java/dev/testify/scenario/ScenarioRuleAssertExpectedDeviceTest.kt b/Library/src/androidTest/java/dev/testify/scenario/ScenarioRuleAssertExpectedDeviceTest.kt index c76c0c111..a410f25a2 100644 --- a/Library/src/androidTest/java/dev/testify/scenario/ScenarioRuleAssertExpectedDeviceTest.kt +++ b/Library/src/androidTest/java/dev/testify/scenario/ScenarioRuleAssertExpectedDeviceTest.kt @@ -1,7 +1,7 @@ /* * The MIT License (MIT) * - * Copyright (c) 2024 ndtp + * Copyright (c) 2026 ndtp * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -44,8 +44,10 @@ class ScenarioRuleAssertExpectedDeviceTest { /** * WHEN the baseline image matches the current device settings THEN success * - * The baseline was recorded against a Pixel 3a (1080x2220 440dpi) running Q API level 29, x86, Android 10.0 (Google APIs) - * key = 29-1080x2220@440dp-en_US + * The baseline was recorded against a Pixel 3a (1080x2220 440dpi) running 16 KB Page Size Google + * APIs ARM 64 v8a System Image, API 37.0 (CinnamonBun; Android 17.0) + * + * key = 37-1080x2220@440dp-en_US * * https://testify.dev/docs/get-started/configuring-an-emulator */ @@ -105,7 +107,7 @@ class ScenarioRuleAssertExpectedDeviceTest { } assertTrue( e.message!!.contains( - "The currently running device '29-1080x2220@440dp-en_US'" + + "The currently running device '37-1080x2220@440dp-en_US'" + " does not match the expected device '33-1080x1920@395dp-en_CA'" ) ) diff --git a/Plugins/Gradle/README.md b/Plugins/Gradle/README.md index 617f8b232..8e15f32d6 100644 --- a/Plugins/Gradle/README.md +++ b/Plugins/Gradle/README.md @@ -517,6 +517,21 @@ Disables the soft keyboard on the device ``` +### disableStylusInput + +Disables stylus input on the device. The stylus input method can disrupt screenshots of text input fields, so it's good to turn it off. + +```console +~/: ./gradlew FlixSample:disableStylusInput + +> Task :FlixSample:disableStylusInput +------------------------------------------------------------ +Disables stylus input on the device +------------------------------------------------------------ + Success + +``` + ### hidePasswords Hides passwords fully on the device. diff --git a/Plugins/Gradle/src/main/kotlin/dev/testify/TestifyPlugin.kt b/Plugins/Gradle/src/main/kotlin/dev/testify/TestifyPlugin.kt index 807e3fd61..67ac95b13 100644 --- a/Plugins/Gradle/src/main/kotlin/dev/testify/TestifyPlugin.kt +++ b/Plugins/Gradle/src/main/kotlin/dev/testify/TestifyPlugin.kt @@ -42,6 +42,7 @@ import dev.testify.tasks.report.ReportShowTask import dev.testify.tasks.utility.DeviceKeyTask import dev.testify.tasks.utility.DevicesTask import dev.testify.tasks.utility.DisableSoftKeyboardTask +import dev.testify.tasks.utility.DisableStylusTask import dev.testify.tasks.utility.HidePasswordsTasks import dev.testify.tasks.utility.LocaleTask import dev.testify.tasks.utility.SettingsTask @@ -109,6 +110,7 @@ class TestifyPlugin : Plugin { registerTask(DeviceKeyTask.Companion) registerTask(DevicesTask.Companion) registerTask(DisableSoftKeyboardTask.Companion) + registerTask(DisableStylusTask.Companion) registerTask(HidePasswordsTasks.Companion) registerTask(InternalScreenshotTestRecordTask.Companion) registerTask(LocaleTask.Companion) diff --git a/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/main/ScreenshotTestTask.kt b/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/main/ScreenshotTestTask.kt index 240c7888c..a0228ac98 100644 --- a/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/main/ScreenshotTestTask.kt +++ b/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/main/ScreenshotTestTask.kt @@ -35,6 +35,7 @@ import dev.testify.tasks.internal.TaskDependencyProvider import dev.testify.tasks.internal.TaskNameProvider import dev.testify.tasks.internal.TestifyDefaultTask import dev.testify.tasks.utility.DisableSoftKeyboardTask +import dev.testify.tasks.utility.DisableStylusTask import dev.testify.tasks.utility.HidePasswordsTasks import dev.testify.tasks.utility.LocaleTask import dev.testify.tasks.utility.TimeZoneTask @@ -189,6 +190,7 @@ open class ScreenshotTestTask : TestifyDefaultTask() { task.dependsOn( HidePasswordsTasks.taskName(), DisableSoftKeyboardTask.taskName(), + DisableStylusTask.taskName(), LocaleTask.taskName(), TimeZoneTask.taskName() ) diff --git a/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/utility/DisableStylusTask.kt b/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/utility/DisableStylusTask.kt new file mode 100644 index 000000000..25fe0432b --- /dev/null +++ b/Plugins/Gradle/src/main/kotlin/dev/testify/tasks/utility/DisableStylusTask.kt @@ -0,0 +1,52 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2026 ndtp + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package dev.testify.tasks.utility + +import dev.testify.internal.Adb +import dev.testify.tasks.internal.TaskNameProvider +import dev.testify.tasks.internal.TestifyUtilityTask + +open class DisableStylusTask : TestifyUtilityTask() { + + override fun getDescription() = "Disables stylus input on the device" + + override fun taskAction() { + Adb(adbServiceProvider.get()).arguments( + "shell", + "settings", + "put", + "secure", + "stylus_handwriting_enabled", + "0" + ) + .execute() + + println(" Success") + } + + companion object : TaskNameProvider { + override fun taskName() = "disableStylusInput" + } +} diff --git a/Plugins/Gradle/src/test/kotlin/dev/testify/tasks/ConfigurationCacheTest.kt b/Plugins/Gradle/src/test/kotlin/dev/testify/tasks/ConfigurationCacheTest.kt index 54561b4b0..b3fce10ce 100644 --- a/Plugins/Gradle/src/test/kotlin/dev/testify/tasks/ConfigurationCacheTest.kt +++ b/Plugins/Gradle/src/test/kotlin/dev/testify/tasks/ConfigurationCacheTest.kt @@ -93,6 +93,7 @@ class ConfigurationCacheTest { "deviceLocale, true", "deviceTimeZone, true", "disableSoftKeyboard, true", + "disableStylusInput, true", "hidePasswords, true", "reportPull, true", "reportShow, true", diff --git a/RECIPES.md b/RECIPES.md index 9f0457809..4e360840f 100644 --- a/RECIPES.md +++ b/RECIPES.md @@ -6,12 +6,14 @@ Examples of advanced test cases. The Sample application includes a baseline for an emulator that's compatible with GitHub Actions. To configure an AVD locally, create a new virtual device with the following settings in the Android Virtual Device (AVD) configuration: -- Phone: Pixel 3a (1080x2220 440dpi) -- Q API level 29, x86, Android 10.0 (Google APIs) -- RAM: 1536 MB +- Phone: Pixel 3a (Obsolete) (1080x2220 440dpi) +- 16 KB Page Size Google APIs ARM 64 v8a System Image, API 37.0 (CinnamonBun; Android 17.0) +- CPU cores: 4 +- Graphics acceleration: Automatic +- RAM: 2 GB - VM heap: 256 MB -- Internal Storage: 2048 MB -- SD card, Studio-managed: 512 MB +- Internal Storage: 10 GB +- Expanded storage, Custom: 512 MB - Enable Device Frame with pixel_3a skin - Enable keyboard input diff --git a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_error.png b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_error.png deleted file mode 100644 index f36ed9727..000000000 Binary files a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_error.png and /dev/null differ diff --git a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_loaded.png b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_loaded.png deleted file mode 100644 index 4592b3d44..000000000 Binary files a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_loaded.png and /dev/null differ diff --git a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_loading.png b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_loading.png deleted file mode 100644 index 7177cb8cd..000000000 Binary files a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastDetailScreenshotTest_loading.png and /dev/null differ diff --git a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_error.png b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_error.png new file mode 100644 index 000000000..44640a4ef Binary files /dev/null and b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_error.png differ diff --git a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_loaded.png b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_loaded.png new file mode 100644 index 000000000..a5c2f6669 Binary files /dev/null and b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_loaded.png differ diff --git a/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_loading.png b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_loading.png new file mode 100644 index 000000000..a1d7efa74 Binary files /dev/null and b/Samples/Flix/FlixLibrary/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastDetailScreenshotTest_loading.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastMemberScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastMemberScreenshotTest_default.png deleted file mode 100644 index c34a062ab..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CastMemberScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png deleted file mode 100644 index 8b9aa0e9e..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_default.png deleted file mode 100644 index c13121b8f..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_emptyCreditStrip.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_emptyCreditStrip.png deleted file mode 100644 index b92f4baf6..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_emptyCreditStrip.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_longCreditStrip.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_longCreditStrip.png deleted file mode 100644 index e82a0db5b..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/CreditStripScreenshotTest_longCreditStrip.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/GenreStripScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/GenreStripScreenshotTest_default.png deleted file mode 100644 index 0ec0e5f24..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/GenreStripScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/GenreStripScreenshotTest_lotsOfGenres.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/GenreStripScreenshotTest_lotsOfGenres.png deleted file mode 100644 index 50022e164..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/GenreStripScreenshotTest_lotsOfGenres.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_default.png deleted file mode 100644 index 9337b876f..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyCertification.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyCertification.png deleted file mode 100644 index aab0e7ac8..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyCertification.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyReleaseDate.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyReleaseDate.png deleted file mode 100644 index 42be2aeb2..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyReleaseDate.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyRuntime.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyRuntime.png deleted file mode 100644 index 5de32ec46..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyRuntime.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MovieDetailsScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MovieDetailsScreenshotTest_default.png deleted file mode 100644 index 31161fc88..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MovieDetailsScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MoviePosterScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MoviePosterScreenshotTest_default.png deleted file mode 100644 index 91ed81ca5..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MoviePosterScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MoviePosterScreenshotTest_nullPosterUrlImpliesLoading.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MoviePosterScreenshotTest_nullPosterUrlImpliesLoading.png deleted file mode 100644 index c8dbc8e85..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MoviePosterScreenshotTest_nullPosterUrlImpliesLoading.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OverviewTextScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OverviewTextScreenshotTest_default.png deleted file mode 100644 index ee95d2e64..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OverviewTextScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OverviewTextScreenshotTest_longText.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OverviewTextScreenshotTest_longText.png deleted file mode 100644 index ab5f7d50f..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OverviewTextScreenshotTest_longText.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_default.png deleted file mode 100644 index 9b08c8525..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_longText.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_longText.png deleted file mode 100644 index a81c9d0bd..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_longText.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_default.png deleted file mode 100644 index 75f24efa9..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_longText.png b/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_longText.png deleted file mode 100644 index 7f9cbd9a2..000000000 Binary files a/Samples/Flix/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_longText.png and /dev/null differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastMemberScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastMemberScreenshotTest_default.png new file mode 100644 index 000000000..0387a937d Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CastMemberScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png new file mode 100644 index 000000000..fa9446aac Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_default.png new file mode 100644 index 000000000..8bb9f3e1c Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_emptyCreditStrip.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_emptyCreditStrip.png new file mode 100644 index 000000000..1520287a8 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_emptyCreditStrip.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_longCreditStrip.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_longCreditStrip.png new file mode 100644 index 000000000..ed5c0effc Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/CreditStripScreenshotTest_longCreditStrip.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/GenreStripScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/GenreStripScreenshotTest_default.png new file mode 100644 index 000000000..4d7f1b2c3 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/GenreStripScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/GenreStripScreenshotTest_lotsOfGenres.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/GenreStripScreenshotTest_lotsOfGenres.png new file mode 100644 index 000000000..8f126c82c Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/GenreStripScreenshotTest_lotsOfGenres.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_default.png new file mode 100644 index 000000000..e880d3c90 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyCertification.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyCertification.png new file mode 100644 index 000000000..19d75260e Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyCertification.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyReleaseDate.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyReleaseDate.png new file mode 100644 index 000000000..9699c4250 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyReleaseDate.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyRuntime.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyRuntime.png new file mode 100644 index 000000000..d781cb425 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MetaDataScreenshotTest_onlyRuntime.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MovieDetailsScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MovieDetailsScreenshotTest_default.png new file mode 100644 index 000000000..1a3dc957c Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MovieDetailsScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MoviePosterScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MoviePosterScreenshotTest_default.png new file mode 100644 index 000000000..9b6b9397e Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MoviePosterScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MoviePosterScreenshotTest_nullPosterUrlImpliesLoading.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MoviePosterScreenshotTest_nullPosterUrlImpliesLoading.png new file mode 100644 index 000000000..78cc1206e Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MoviePosterScreenshotTest_nullPosterUrlImpliesLoading.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OverviewTextScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OverviewTextScreenshotTest_default.png new file mode 100644 index 000000000..b732059ea Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OverviewTextScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OverviewTextScreenshotTest_longText.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OverviewTextScreenshotTest_longText.png new file mode 100644 index 000000000..e205fff3d Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OverviewTextScreenshotTest_longText.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_default.png new file mode 100644 index 000000000..b32bddb70 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_longText.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_longText.png new file mode 100644 index 000000000..a8d474a76 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/PrimaryTitleScreenshotTest_longText.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_default.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_default.png new file mode 100644 index 000000000..0280f684e Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_default.png differ diff --git a/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_longText.png b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_longText.png new file mode 100644 index 000000000..16c1fba08 Binary files /dev/null and b/Samples/Flix/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/SecondaryTitleScreenshotTest_longText.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_CA/TestingResourceConfigurationsExampleTest_testLocaleCanada.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_CA/TestingResourceConfigurationsExampleTest_testLocaleCanada.png deleted file mode 100644 index 199e35106..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_CA/TestingResourceConfigurationsExampleTest_testLocaleCanada.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_default.png deleted file mode 100644 index 0e66a90cf..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.png deleted file mode 100644 index 29513d629..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.png deleted file mode 100644 index 0e66a90cf..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_default.png deleted file mode 100644 index 318ebe544..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_usingLayoutResName.png deleted file mode 100644 index 72245ab0d..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_usingLayoutResName.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnBackground.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnBackground.png deleted file mode 100644 index 63fa857fc..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnBackground.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnFab.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnFab.png deleted file mode 100644 index 5224de339..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnFab.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_clientListItem.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_clientListItem.png deleted file mode 100644 index cf01872a4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_clientListItem.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png deleted file mode 100644 index 5a3d377aa..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_dialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_dialog.png deleted file mode 100644 index 525e123b2..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_dialog.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_dropdownMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_dropdownMenu.png deleted file mode 100644 index 794ccde19..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_dropdownMenu.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_paddedBoxes.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_paddedBoxes.png deleted file mode 100644 index 6b13eb21a..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_paddedBoxes.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_topAppBar.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_topAppBar.png deleted file mode 100644 index f912d7010..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposableScreenshotTest_topAppBar.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_default.png deleted file mode 100644 index 0370d7c9d..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownCollapsed.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownCollapsed.png deleted file mode 100644 index 1fc7bccef..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownCollapsed.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownExpanded.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownExpanded.png deleted file mode 100644 index 122878a66..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownExpanded.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_default.png deleted file mode 100644 index 059a38d5f..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_scrollingList.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_scrollingList.png deleted file mode 100644 index abccb343c..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_scrollingList.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_fullscreen.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_fullscreen.png deleted file mode 100644 index 505da8617..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_fullscreen.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withDialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withDialog.png deleted file mode 100644 index 7c510ec38..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withDialog.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withMenu.png deleted file mode 100644 index 9e3110cb4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withMenu.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/JavaExampleTest_testConfiguration.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/JavaExampleTest_testConfiguration.png deleted file mode 100644 index 1c6c5e05b..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/JavaExampleTest_testConfiguration.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/JavaExampleTest_testJava.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/JavaExampleTest_testJava.png deleted file mode 100644 index ca3be6367..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/JavaExampleTest_testJava.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MainActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MainActivityScreenshotTest_default.png deleted file mode 100644 index ca3be6367..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/MainActivityScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OrientationTest_c.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OrientationTest_c.png deleted file mode 100644 index 1743f12c3..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/OrientationTest_c.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_default.png deleted file mode 100644 index 318ebe544..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_usingLayoutResName.png deleted file mode 100644 index 72245ab0d..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_usingLayoutResName.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnBackground.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnBackground.png deleted file mode 100644 index 63fa857fc..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnBackground.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnFab.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnFab.png deleted file mode 100644 index 5224de339..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnFab.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_clientListItem.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_clientListItem.png deleted file mode 100644 index cf01872a4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_clientListItem.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_default.png deleted file mode 100644 index 5a3d377aa..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dialog.png deleted file mode 100644 index 0e34a05eb..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dialog.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dropdownMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dropdownMenu.png deleted file mode 100644 index 794ccde19..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dropdownMenu.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_paddedBoxes.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_paddedBoxes.png deleted file mode 100644 index 6b13eb21a..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_paddedBoxes.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_topAppBar.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_topAppBar.png deleted file mode 100644 index f912d7010..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_topAppBar.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_default.png deleted file mode 100644 index 0370d7c9d..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownCollapsed.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownCollapsed.png deleted file mode 100644 index 1fc7bccef..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownCollapsed.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownExpanded.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownExpanded.png deleted file mode 100644 index b06b36361..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownExpanded.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_default.png deleted file mode 100644 index 059a38d5f..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_scrollingList.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_scrollingList.png deleted file mode 100644 index abccb343c..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_scrollingList.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_fullscreen.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_fullscreen.png deleted file mode 100644 index 505da8617..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_fullscreen.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withDialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withDialog.png deleted file mode 100644 index 7c510ec38..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withDialog.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withMenu.png deleted file mode 100644 index 9e3110cb4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withMenu.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioMainActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioMainActivityScreenshotTest_default.png deleted file mode 100644 index ca3be6367..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScenarioMainActivityScreenshotTest_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_addIntentExtras.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_addIntentExtras.png deleted file mode 100644 index c6312dca2..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_addIntentExtras.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_captureMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_captureMethodExample.png deleted file mode 100644 index 605a8d3e9..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_captureMethodExample.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_customCapture.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_customCapture.png deleted file mode 100644 index 1dae852b7..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_customCapture.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_default.png deleted file mode 100644 index 98ea676ba..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_exclusions.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_exclusions.png deleted file mode 100644 index dfe9d8b70..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_exclusions.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.diff.png deleted file mode 100644 index daf3f371b..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.diff.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.png deleted file mode 100644 index 226a19cb5..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactness.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactness.png deleted file mode 100644 index 75fd6fcba..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactness.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactnessAnnotation.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactnessAnnotation.png deleted file mode 100644 index 9d5c768b4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactnessAnnotation.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setScreenshotViewProvider.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setScreenshotViewProvider.png deleted file mode 100644 index fb5e8a5d0..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setScreenshotViewProvider.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setTargetLayoutId.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setTargetLayoutId.png deleted file mode 100644 index 7a7a9328c..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setTargetLayoutId.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setUseSoftwareRenderer.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setUseSoftwareRenderer.png deleted file mode 100644 index ed02e4181..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setUseSoftwareRenderer.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_usingLayoutResName.png deleted file mode 100644 index fbee69934..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_usingLayoutResName.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.png deleted file mode 100644 index f757e5927..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_addIntentExtras.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_addIntentExtras.png deleted file mode 100644 index c6312dca2..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_addIntentExtras.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_captureMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_captureMethodExample.png deleted file mode 100644 index 605a8d3e9..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_captureMethodExample.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_customCapture.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_customCapture.png deleted file mode 100644 index 1dae852b7..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_customCapture.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_default.png deleted file mode 100644 index 98ea676ba..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_default.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_exclusions.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_exclusions.png deleted file mode 100644 index c1bb4a8c4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_exclusions.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_fontScale.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_fontScale.png deleted file mode 100644 index 9914d0edd..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_fontScale.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.diff.png deleted file mode 100644 index daf3f371b..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.diff.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.png deleted file mode 100644 index 226a19cb5..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setEspressoActions.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setEspressoActions.png deleted file mode 100644 index 3464f31d6..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setEspressoActions.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactness.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactness.png deleted file mode 100644 index 75fd6fcba..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactness.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactnessAnnotation.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactnessAnnotation.png deleted file mode 100644 index 9d5c768b4..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactnessAnnotation.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setScreenshotViewProvider.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setScreenshotViewProvider.png deleted file mode 100644 index fb5e8a5d0..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setScreenshotViewProvider.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_usingLayoutResName.png deleted file mode 100644 index fbee69934..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_usingLayoutResName.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/TestingResourceConfigurationsExampleTest_increaseFontScale.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/TestingResourceConfigurationsExampleTest_increaseFontScale.png deleted file mode 100644 index f965d8b1e..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/TestingResourceConfigurationsExampleTest_increaseFontScale.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-fr_FR/TestingResourceConfigurationsExampleTest_testLocaleFrance.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-fr_FR/TestingResourceConfigurationsExampleTest_testLocaleFrance.png deleted file mode 100644 index 10c65c104..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-fr_FR/TestingResourceConfigurationsExampleTest_testLocaleFrance.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/ComposableScreenshotTest_localeAndFontScale.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/ComposableScreenshotTest_localeAndFontScale.png deleted file mode 100644 index a4d3633f0..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/ComposableScreenshotTest_localeAndFontScale.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/ScreenshotScenarioRuleExampleTests_locale.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/ScreenshotScenarioRuleExampleTests_locale.png deleted file mode 100644 index e824129be..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/ScreenshotScenarioRuleExampleTests_locale.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_reduceFontScaleAndChangeLocale.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_reduceFontScaleAndChangeLocale.png deleted file mode 100644 index 8d1435a8b..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_reduceFontScaleAndChangeLocale.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_testLocaleJapan.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_testLocaleJapan.png deleted file mode 100644 index a663583ec..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_testLocaleJapan.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_a.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_a.png deleted file mode 100644 index 07c6dbd4d..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_a.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_b.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_b.png deleted file mode 100644 index 7fb882199..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_b.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_d.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_d.png deleted file mode 100644 index 7297108cd..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/OrientationTest_d.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotRuleExampleTests_setOrientation.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotRuleExampleTests_setOrientation.png deleted file mode 100644 index 800b18e2f..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotRuleExampleTests_setOrientation.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotScenarioRuleExampleTests_setOrientation.png b/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotScenarioRuleExampleTests_setOrientation.png deleted file mode 100644 index 800b18e2f..000000000 Binary files a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/ScreenshotScenarioRuleExampleTests_setOrientation.png and /dev/null differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_CA/TestingResourceConfigurationsExampleTest_testLocaleCanada.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_CA/TestingResourceConfigurationsExampleTest_testLocaleCanada.png new file mode 100644 index 000000000..fbba22ca2 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_CA/TestingResourceConfigurationsExampleTest_testLocaleCanada.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_default.png new file mode 100644 index 000000000..3d5d612bf Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.a11y.json b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.a11y.json similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.a11y.json rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.a11y.json diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.png new file mode 100644 index 000000000..a56f037c5 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_fixed.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.a11y.json b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.a11y.json similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.a11y.json rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.a11y.json diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.png new file mode 100644 index 000000000..3d5d612bf Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/AccessibilityExampleTest_withErrors.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_default.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_default.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_default.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_focus.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_focus.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_focus.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_focus.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_hideSoftKeyboard.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_hideSoftKeyboard.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_hideSoftKeyboard.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_hideSoftKeyboard.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_textFlags.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_textFlags.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_textFlags.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityEditTextTest_textFlags.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_addIntentExtras.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_addIntentExtras.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_addIntentExtras.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_addIntentExtras.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_captureMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_captureMethodExample.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_captureMethodExample.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_captureMethodExample.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_compareMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_compareMethodExample.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_compareMethodExample.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_compareMethodExample.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_customCapture.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_customCapture.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_customCapture.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_customCapture.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_default.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_default.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_default.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_exclusions.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_exclusions.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_exclusions.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_exclusions.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_generateDiffs.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_generateDiffs.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_generateDiffs.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_generateDiffs.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setEspressoActions.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setEspressoActions.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setEspressoActions.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setEspressoActions.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactness.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactness.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactness.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactness.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactnessAnnotation.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactnessAnnotation.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactnessAnnotation.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setExactnessAnnotation.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setScreenshotViewProvider.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setScreenshotViewProvider.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setScreenshotViewProvider.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setScreenshotViewProvider.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setTargetLayoutId.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setTargetLayoutId.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setTargetLayoutId.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setTargetLayoutId.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setUseSoftwareRenderer.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setUseSoftwareRenderer.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setUseSoftwareRenderer.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_setUseSoftwareRenderer.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_usingLayoutResName.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_usingLayoutResName.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_usingLayoutResName.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_withExperimentalFeatureEnabled.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_withExperimentalFeatureEnabled.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityTest_withExperimentalFeatureEnabled.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityTest_withExperimentalFeatureEnabled.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityests_generateDiffs.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityests_generateDiffs.diff.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityests_generateDiffs.diff.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityests_generateDiffs.diff.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityests_withExperimentalFeatureEnabled.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityests_withExperimentalFeatureEnabled.diff.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/BackwardsCompatibilityests_withExperimentalFeatureEnabled.diff.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/BackwardsCompatibilityests_withExperimentalFeatureEnabled.diff.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_default.png new file mode 100644 index 000000000..8e68dba88 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_usingLayoutResName.png new file mode 100644 index 000000000..429ab38e7 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientDetailsViewScreenshotTest_usingLayoutResName.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnBackground.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnBackground.png new file mode 100644 index 000000000..3464b95d9 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnBackground.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnFab.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnFab.png new file mode 100644 index 000000000..05b007bfb Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ClientListActivityScreenshotTest_withFocusOnFab.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_clientListItem.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_clientListItem.png new file mode 100644 index 000000000..5ffe7f1ee Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_clientListItem.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png new file mode 100644 index 000000000..d2ff1b925 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_dialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_dialog.png new file mode 100644 index 000000000..b8658cb70 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_dialog.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_dropdownMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_dropdownMenu.png new file mode 100644 index 000000000..af686be39 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_dropdownMenu.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_paddedBoxes.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_paddedBoxes.png new file mode 100644 index 000000000..bb269f9bb Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_paddedBoxes.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_topAppBar.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_topAppBar.png new file mode 100644 index 000000000..4ff772e34 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposableScreenshotTest_topAppBar.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_default.png new file mode 100644 index 000000000..d6eea3051 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownCollapsed.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownCollapsed.png new file mode 100644 index 000000000..d6eea3051 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownCollapsed.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownExpanded.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownExpanded.png new file mode 100644 index 000000000..03664db8e Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeActivityScreenshotTest_dropDownExpanded.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_default.png new file mode 100644 index 000000000..16f2539f4 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_scrollingList.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_scrollingList.png new file mode 100644 index 000000000..77ce1968d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ComposeRuleInteropScreenshotTest_scrollingList.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_fullscreen.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_fullscreen.png new file mode 100644 index 000000000..9562d0d6f Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_fullscreen.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withDialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withDialog.png new file mode 100644 index 000000000..d1c2a69be Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withDialog.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withMenu.png new file mode 100644 index 000000000..4e984afe0 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/FullscreenCaptureExampleTest_withMenu.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/JavaExampleTest_testConfiguration.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/JavaExampleTest_testConfiguration.png new file mode 100644 index 000000000..99e82f350 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/JavaExampleTest_testConfiguration.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/JavaExampleTest_testJava.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/JavaExampleTest_testJava.png new file mode 100644 index 000000000..78726af1e Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/JavaExampleTest_testJava.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MainActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MainActivityScreenshotTest_default.png new file mode 100644 index 000000000..78726af1e Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/MainActivityScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OrientationTest_c.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OrientationTest_c.png new file mode 100644 index 000000000..24a68ef8a Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/OrientationTest_c.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_default.png new file mode 100644 index 000000000..8e68dba88 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_usingLayoutResName.png new file mode 100644 index 000000000..429ab38e7 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientDetailsViewScreenshotTest_usingLayoutResName.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnBackground.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnBackground.png new file mode 100644 index 000000000..e8c09ef0a Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnBackground.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnFab.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnFab.png new file mode 100644 index 000000000..0b90d0152 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioClientListActivityScreenshotTest_withFocusOnFab.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_clientListItem.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_clientListItem.png new file mode 100644 index 000000000..5ffe7f1ee Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_clientListItem.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_default.png new file mode 100644 index 000000000..d2ff1b925 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dialog.png new file mode 100644 index 000000000..bca2d6e75 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dialog.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dropdownMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dropdownMenu.png new file mode 100644 index 000000000..76892bac0 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_dropdownMenu.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_paddedBoxes.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_paddedBoxes.png new file mode 100644 index 000000000..bb269f9bb Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_paddedBoxes.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_topAppBar.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_topAppBar.png new file mode 100644 index 000000000..4ff772e34 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposableScreenshotTest_topAppBar.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_default.png new file mode 100644 index 000000000..91b0e4f18 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownCollapsed.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownCollapsed.png new file mode 100644 index 000000000..91b0e4f18 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownCollapsed.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownExpanded.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownExpanded.png new file mode 100644 index 000000000..918be8064 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeActivityScreenshotTest_dropDownExpanded.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_default.png new file mode 100644 index 000000000..16f2539f4 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_scrollingList.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_scrollingList.png new file mode 100644 index 000000000..77ce1968d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioComposeRuleInteropScreenshotTest_scrollingList.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_fullscreen.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_fullscreen.png new file mode 100644 index 000000000..9562d0d6f Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_fullscreen.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withDialog.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withDialog.png new file mode 100644 index 000000000..f206e682a Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withDialog.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withMenu.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withMenu.png new file mode 100644 index 000000000..6db5237ef Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioFullscreenCaptureExampleTest_withMenu.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioMainActivityScreenshotTest_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioMainActivityScreenshotTest_default.png new file mode 100644 index 000000000..78726af1e Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScenarioMainActivityScreenshotTest_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_addIntentExtras.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_addIntentExtras.png new file mode 100644 index 000000000..1e73ac9ac Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_addIntentExtras.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_captureMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_captureMethodExample.png new file mode 100644 index 000000000..effd745e4 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_captureMethodExample.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_compareMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_compareMethodExample.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_compareMethodExample.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_compareMethodExample.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_customCapture.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_customCapture.png new file mode 100644 index 000000000..f9fa49e25 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_customCapture.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_default.png new file mode 100644 index 000000000..1f9c84239 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_exclusions.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_exclusions.png new file mode 100644 index 000000000..40e0302de Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_exclusions.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.diff.png new file mode 100644 index 000000000..965e720fe Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.diff.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.png new file mode 100644 index 000000000..f0188ded3 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_generateDiffs.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setEspressoActions.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setEspressoActions.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setEspressoActions.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setEspressoActions.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactness.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactness.png new file mode 100644 index 000000000..26d5c26e7 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactness.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactnessAnnotation.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactnessAnnotation.png new file mode 100644 index 000000000..26d5c26e7 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setExactnessAnnotation.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setScreenshotViewProvider.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setScreenshotViewProvider.png new file mode 100644 index 000000000..c744c570d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setScreenshotViewProvider.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setTargetLayoutId.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setTargetLayoutId.png new file mode 100644 index 000000000..44e96d26d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setTargetLayoutId.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setUseSoftwareRenderer.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setUseSoftwareRenderer.png new file mode 100644 index 000000000..1cf3f20f9 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_setUseSoftwareRenderer.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_usingLayoutResName.png new file mode 100644 index 000000000..5e8a1f560 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_usingLayoutResName.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.diff.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.diff.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.diff.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.png new file mode 100644 index 000000000..f1612cd10 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotRuleExampleTests_withExperimentalFeatureEnabled.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_addIntentExtras.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_addIntentExtras.png new file mode 100644 index 000000000..1e73ac9ac Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_addIntentExtras.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_captureMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_captureMethodExample.png new file mode 100644 index 000000000..effd745e4 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_captureMethodExample.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_compareMethodExample.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_compareMethodExample.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_compareMethodExample.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_compareMethodExample.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_customCapture.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_customCapture.png new file mode 100644 index 000000000..f9fa49e25 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_customCapture.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_default.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_default.png new file mode 100644 index 000000000..1f9c84239 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_default.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_exclusions.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_exclusions.png new file mode 100644 index 000000000..9aa3e7482 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_exclusions.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_fontScale.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_fontScale.png new file mode 100644 index 000000000..d808fb2d0 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_fontScale.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.diff.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.diff.png new file mode 100644 index 000000000..965e720fe Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.diff.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.png new file mode 100644 index 000000000..f0188ded3 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_generateDiffs.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setEspressoActions.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setEspressoActions.png new file mode 100644 index 000000000..0d2286b5d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setEspressoActions.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactness.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactness.png new file mode 100644 index 000000000..a59ad8a19 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactness.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactnessAnnotation.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactnessAnnotation.png new file mode 100644 index 000000000..80e6c20bb Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setExactnessAnnotation.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setScreenshotViewProvider.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setScreenshotViewProvider.png new file mode 100644 index 000000000..c744c570d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_setScreenshotViewProvider.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_usingLayoutResName.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_usingLayoutResName.png new file mode 100644 index 000000000..5e8a1f560 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/ScreenshotScenarioRuleExampleTests_usingLayoutResName.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/TestingResourceConfigurationsExampleTest_increaseFontScale.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/TestingResourceConfigurationsExampleTest_increaseFontScale.png new file mode 100644 index 000000000..94791891e Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-en_US/TestingResourceConfigurationsExampleTest_increaseFontScale.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-fr_FR/TestingResourceConfigurationsExampleTest_testLocaleFrance.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-fr_FR/TestingResourceConfigurationsExampleTest_testLocaleFrance.png new file mode 100644 index 000000000..04c3629f7 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-fr_FR/TestingResourceConfigurationsExampleTest_testLocaleFrance.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/BackwardsCompatibilityTestifyResourcesOverrideTest_reduceFontScaleAndChangeLocale.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/BackwardsCompatibilityTestifyResourcesOverrideTest_reduceFontScaleAndChangeLocale.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-1080x2220@440dp-ja_JP/BackwardsCompatibilityTestifyResourcesOverrideTest_reduceFontScaleAndChangeLocale.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/BackwardsCompatibilityTestifyResourcesOverrideTest_reduceFontScaleAndChangeLocale.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/ComposableScreenshotTest_localeAndFontScale.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/ComposableScreenshotTest_localeAndFontScale.png new file mode 100644 index 000000000..d81875be6 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/ComposableScreenshotTest_localeAndFontScale.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/ScreenshotScenarioRuleExampleTests_locale.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/ScreenshotScenarioRuleExampleTests_locale.png new file mode 100644 index 000000000..548a86e00 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/ScreenshotScenarioRuleExampleTests_locale.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_reduceFontScaleAndChangeLocale.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_reduceFontScaleAndChangeLocale.png new file mode 100644 index 000000000..937a89a6d Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_reduceFontScaleAndChangeLocale.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_testLocaleJapan.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_testLocaleJapan.png new file mode 100644 index 000000000..5e4fd9649 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-1080x2220@440dp-ja_JP/TestingResourceConfigurationsExampleTest_testLocaleJapan.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/BackwardsCompatibilityTest_setOrientation.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/BackwardsCompatibilityTest_setOrientation.png similarity index 100% rename from Samples/Legacy/src/androidTest/assets/screenshots/29-2220x1080@440dp-en_US/BackwardsCompatibilityTest_setOrientation.png rename to Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/BackwardsCompatibilityTest_setOrientation.png diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_a.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_a.png new file mode 100644 index 000000000..c44765d5f Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_a.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_b.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_b.png new file mode 100644 index 000000000..df0c03276 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_b.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_d.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_d.png new file mode 100644 index 000000000..05fb43fb3 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/OrientationTest_d.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotRuleExampleTests_setOrientation.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotRuleExampleTests_setOrientation.png new file mode 100644 index 000000000..204d7f624 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotRuleExampleTests_setOrientation.png differ diff --git a/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotScenarioRuleExampleTests_setOrientation.png b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotScenarioRuleExampleTests_setOrientation.png new file mode 100644 index 000000000..204d7f624 Binary files /dev/null and b/Samples/Legacy/src/androidTest/assets/screenshots/37-2220x1080@440dp-en_US/ScreenshotScenarioRuleExampleTests_setOrientation.png differ diff --git a/Samples/Legacy/src/main/res/values/styles.xml b/Samples/Legacy/src/main/res/values/styles.xml index fef37f9bf..4eba6478b 100644 --- a/Samples/Legacy/src/main/res/values/styles.xml +++ b/Samples/Legacy/src/main/res/values/styles.xml @@ -1,4 +1,4 @@ - +