From 85b2fabf2762bd12c5aff496c65580b4e6683518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= <jalc@google.com>
Date: Tue, 21 May 2024 17:00:54 +0000
Subject: [PATCH] CI and temporary (?) fix in 26

Change-Id: Ibf487f37d3a9274d34ff78b47a3909fd275648e5
---
 .github/workflows/Build.yaml                              | 1 +
 .../google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt | 3 ++-
 app/src/debug/AndroidManifest.xml                         | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 app/src/debug/AndroidManifest.xml

diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 878be4d11..64c63f40f 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -213,6 +213,7 @@ jobs:
 
       - name: Record new instrumented screenshots
         id: screenshotsrecordinstrumented
+        continue-on-error: true
         if: steps.dropshotsverify.outcome == 'failure' && github.event_name == 'pull_request'
         uses: reactivecircus/android-emulator-runner@v2
         with:
diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt
index 51f5bc1ec..ceae429d5 100644
--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt
+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/EdgeToEdgeTest.kt
@@ -54,7 +54,8 @@ class EdgeToEdgeTest {
     val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()
 
     /**
-     * Grant [android.Manifest.permission.POST_NOTIFICATIONS] permission.
+     * Grant [android.Manifest.permission.POST_NOTIFICATIONS] permission to prevent the
+     * permissions dialog from showing on top.
      */
     @get:Rule(order = 2)
     val postNotificationsPermission = GrantPostNotificationsPermissionRule()
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000..5920995fb
--- /dev/null
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- Needed for Dropshots on API 26 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+
+</manifest>