From d3fea7b5a7fff86c5a307aebcc44f9e819ac6d22 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Wed, 5 May 2021 03:23:24 +1000
Subject: [PATCH] Android: Fix quick menu in light mode

---
 .../main/res/layout/fragment_emulation_activity_overlay.xml | 2 +-
 android/app/src/main/res/values-night/colors.xml            | 3 +++
 android/app/src/main/res/values/colors.xml                  | 3 ++-
 android/app/src/main/res/values/styles.xml                  | 6 ++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml b/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
index f7e8627fb..b81ea5af6 100644
--- a/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
+++ b/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
@@ -8,7 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#99111111"
+        android:background="@color/emulationActivityPauseTitleBackground"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 44c3065b0..591ae6935 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -7,4 +7,7 @@
 
     <color name="black_overlay">#66000000</color>
     <color name="fab_background">#222222</color>
+
+    <color name="emulationActivityPauseBackground">#cc000000</color>
+    <color name="emulationActivityPauseTitleBackground">#99111111</color>
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 51a368a41..4b3edbf22 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -8,5 +8,6 @@
     <color name="black_overlay">#66000000</color>
     <color name="fab_background">#ffffffff</color>
 
-    <color name="settings_overlay_background">#dd111111</color>
+    <color name="emulationActivityPauseBackground">#eeffffff</color>
+    <color name="emulationActivityPauseTitleBackground">#996200EE</color>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 5ceccaa6d..83f0c72bb 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -35,13 +35,11 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="EmulationActivityOverlay" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="EmulationActivityOverlay" parent="ThemeOverlay.AppCompat.Dark">
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@color/emulationActivityPauseBackground</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:backgroundDimAmount">0.8</item>
     </style>
 </resources>