From e11560b982dd51372312fea35441e53a00b8aca1 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 15 Nov 2022 12:49:49 +0000
Subject: [PATCH 1/2] remove background colour applied to Android inputs on
 paste

---
 android/app/src/main/res/values-v26/styles.xml | 7 +++++++
 android/app/src/main/res/values/styles.xml     | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 android/app/src/main/res/values-v26/styles.xml

diff --git a/android/app/src/main/res/values-v26/styles.xml b/android/app/src/main/res/values-v26/styles.xml
new file mode 100644
index 000000000000..ca388fbf5893
--- /dev/null
+++ b/android/app/src/main/res/values-v26/styles.xml
@@ -0,0 +1,7 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="AppTheme" parent="BaseAppTheme">
+        <item name="android:autofilledHighlight">@android:color/transparent</item>
+    </style>
+
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 297b87b433dd..a7e2263f1197 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,8 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
+    <style name="AppTheme" parent="BaseAppTheme"/>
+
+    <style name="BaseAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:textColor">@color/dark</item>
         <item name="android:colorEdgeEffect">@color/gray4</item>
         <item name="colorAccent">@color/accent</item>

From 5bedd62f2687d14db2fa61c69f42c406430d783e Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Tue, 15 Nov 2022 12:50:20 +0000
Subject: [PATCH 2/2] improve Android styles documentation

---
 android/app/src/main/res/values-v26/styles.xml | 1 +
 android/app/src/main/res/values/styles.xml     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/values-v26/styles.xml b/android/app/src/main/res/values-v26/styles.xml
index ca388fbf5893..fbef3b91f60f 100644
--- a/android/app/src/main/res/values-v26/styles.xml
+++ b/android/app/src/main/res/values-v26/styles.xml
@@ -1,5 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- App Theme for Android 8.0 and above -->
     <style name="AppTheme" parent="BaseAppTheme">
         <item name="android:autofilledHighlight">@android:color/transparent</item>
     </style>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index a7e2263f1197..0cad8b818b02 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,8 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Base application theme. -->
+    <!-- App Theme for Android versions 7.1 and below -->
     <style name="AppTheme" parent="BaseAppTheme"/>
 
+    <!-- Base application theme. Applied to all Android versions -->
     <style name="BaseAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:textColor">@color/dark</item>
         <item name="android:colorEdgeEffect">@color/gray4</item>
@@ -12,8 +13,9 @@
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     </style>
 
+    <!-- Themes unique to the boot splash page -->
     <style name="BootTheme" parent="AppTheme">
-        <!-- set the generated bootsplash.xml drawable as activity background -->
         <item name="android:background">@drawable/bootsplash</item>
     </style>
+
 </resources>