From 28bb3f1b2fe56e0842eed15aa1f43243afdc634f Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Tue, 19 Dec 2023 13:46:40 +0000
Subject: [PATCH 1/3] Add comment explaining why the launcher icon colors
 differ per build variant

Change-Id: I30126402370162ccbe53e177652583e4472f2030
---
 app/src/benchmark/res/values-night/colors.xml | 2 ++
 app/src/benchmark/res/values/colors.xml       | 2 ++
 app/src/debug/res/values-night/colors.xml     | 2 ++
 app/src/debug/res/values/colors.xml           | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/app/src/benchmark/res/values-night/colors.xml b/app/src/benchmark/res/values-night/colors.xml
index 677eb4e03..7e62bc52c 100644
--- a/app/src/benchmark/res/values-night/colors.xml
+++ b/app/src/benchmark/res/values-night/colors.xml
@@ -14,6 +14,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- Allow users to distinguish between build variants by having a different background color for
+the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
index d33b7ba72..8524b17d2 100644
--- a/app/src/benchmark/res/values/colors.xml
+++ b/app/src/benchmark/res/values/colors.xml
@@ -14,6 +14,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- Allow users to distinguish between build variants by having a different background color for
+the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
index d6a4c98e0..2d36bde01 100644
--- a/app/src/debug/res/values-night/colors.xml
+++ b/app/src/debug/res/values-night/colors.xml
@@ -14,6 +14,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- Allow users to distinguish between build variants by having a different background color for
+the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index 6365ddb3f..56a856913 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -14,6 +14,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- Allow users to distinguish between build variants by having a different background color for
+the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>

From d018e57f526d38d8de8a6a7798eda25742cc93a6 Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Tue, 19 Dec 2023 16:05:36 +0000
Subject: [PATCH 2/3] Fix spotless

Change-Id: I5dea4fec5b391e8cb7794af13e99978fcb622fbb
---
 app/src/benchmark/res/values-night/colors.xml | 2 --
 app/src/benchmark/res/values/colors.xml       | 2 --
 app/src/debug/res/values-night/colors.xml     | 2 --
 app/src/debug/res/values/colors.xml           | 2 --
 4 files changed, 8 deletions(-)

diff --git a/app/src/benchmark/res/values-night/colors.xml b/app/src/benchmark/res/values-night/colors.xml
index 7e62bc52c..677eb4e03 100644
--- a/app/src/benchmark/res/values-night/colors.xml
+++ b/app/src/benchmark/res/values-night/colors.xml
@@ -14,8 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Allow users to distinguish between build variants by having a different background color for
-the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
index 8524b17d2..d33b7ba72 100644
--- a/app/src/benchmark/res/values/colors.xml
+++ b/app/src/benchmark/res/values/colors.xml
@@ -14,8 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Allow users to distinguish between build variants by having a different background color for
-the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
index 2d36bde01..d6a4c98e0 100644
--- a/app/src/debug/res/values-night/colors.xml
+++ b/app/src/debug/res/values-night/colors.xml
@@ -14,8 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Allow users to distinguish between build variants by having a different background color for
-the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index 56a856913..6365ddb3f 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -14,8 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Allow users to distinguish between build variants by having a different background color for
-the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
 <resources>
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>

From b801a7deeae4a474bedfa12e95b817e7bc83c090 Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Wed, 20 Dec 2023 18:55:34 +0000
Subject: [PATCH 3/3] Moving comments to _after_ first XML element

Change-Id: Id4271a67ffcfbd712a2dd1f363970fcd31ee5ac0
---
 app/src/benchmark/res/values-night/colors.xml | 2 ++
 app/src/benchmark/res/values/colors.xml       | 2 ++
 app/src/debug/res/values-night/colors.xml     | 2 ++
 app/src/debug/res/values/colors.xml           | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/app/src/benchmark/res/values-night/colors.xml b/app/src/benchmark/res/values-night/colors.xml
index 677eb4e03..cbf22c766 100644
--- a/app/src/benchmark/res/values-night/colors.xml
+++ b/app/src/benchmark/res/values-night/colors.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+        for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>
diff --git a/app/src/benchmark/res/values/colors.xml b/app/src/benchmark/res/values/colors.xml
index d33b7ba72..a98c6d8f6 100644
--- a/app/src/benchmark/res/values/colors.xml
+++ b/app/src/benchmark/res/values/colors.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+        for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
index d6a4c98e0..daa017e4a 100644
--- a/app/src/debug/res/values-night/colors.xml
+++ b/app/src/debug/res/values-night/colors.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+    for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index 6365ddb3f..487a7820b 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+    for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>