Re-record sample and library baselines on an API 37 emulator

.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:

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.

Library/build.gradle

@@ -30,7 +30,7 @@ base {
     archivesName = pom.artifact
 }
 
-jacoco { toolVersion = "0.8.10" }
+jacoco { toolVersion = "0.8.15" }
 
 android {
     compileOptions {

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'"
             )
         )

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'"
             )
         )

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.

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<Project> {
         registerTask<DeviceKeyTask>(DeviceKeyTask.Companion)
         registerTask<DevicesTask>(DevicesTask.Companion)
         registerTask<DisableSoftKeyboardTask>(DisableSoftKeyboardTask.Companion)
+        registerTask<DisableStylusTask>(DisableStylusTask.Companion)
         registerTask<HidePasswordsTasks>(HidePasswordsTasks.Companion)
         registerTask<InternalScreenshotTestRecordTask>(InternalScreenshotTestRecordTask.Companion)
         registerTask<LocaleTask>(LocaleTask.Companion)

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()
             )

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"
+    }
+}

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",

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
 

Samples/Legacy/src/main/res/values/styles.xml

@@ -1,11 +1,12 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <style name="AppTheme.NoActionBar">

bitrise.yml

@@ -118,14 +118,16 @@ workflows:
       dependencies, install Android tools, run your Android unit tests and save the
       test report.
     steps:
-    - avd-manager@1:
+    - avd-manager@2:
         timeout: 240
         inputs:
-        - api_level: '29'
+        - api_level: '37.0'
         - start_command_flags: "-camera-back none -camera-front none -no-window -gpu
             swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -partition-size
             6144"
         - profile: pixel_3a
+        - tag: google_apis_ps16k
+        - abi: x86_64
         title: 'Emulator: Launch'
     - wait-for-android-emulator@1:
         timeout: 300