From 89593d70bfa725e55b46dd0f66dd1ceb7eebfaae Mon Sep 17 00:00:00 2001
From: Charles Lombardo
Date: Thu, 20 Apr 2023 14:32:43 -0400
Subject: android: Remove check for API 29 in themes

---
 src/android/app/src/main/res/values-v29/themes.xml | 11 -----------
 src/android/app/src/main/res/values/themes.xml     |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 src/android/app/src/main/res/values-v29/themes.xml

(limited to 'src/android')

diff --git a/src/android/app/src/main/res/values-v29/themes.xml b/src/android/app/src/main/res/values-v29/themes.xml
deleted file mode 100644
index ba436f7a4..000000000
--- a/src/android/app/src/main/res/values-v29/themes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.V29.Yuzu" parent="Theme.Yuzu">
-        <item name="android:enforceStatusBarContrast">false</item>
-        <item name="android:enforceNavigationBarContrast">false</item>
-    </style>
-
-    <style name="Theme.Yuzu.Main" parent="Theme.V29.Yuzu" />
-
-</resources>
diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml
index dfad059b6..127eaf70e 100644
--- a/src/android/app/src/main/res/values/themes.xml
+++ b/src/android/app/src/main/res/values/themes.xml
@@ -7,7 +7,7 @@
         <item name="postSplashScreenTheme">@style/Theme.Yuzu.Main</item>
     </style>
 
-    <style name="Theme.Yuzu" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.Yuzu.Main" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/yuzu_primary</item>
         <item name="colorOnPrimary">@color/yuzu_onPrimary</item>
         <item name="colorPrimaryContainer">@color/yuzu_primaryContainer</item>
@@ -42,9 +42,9 @@
         <item name="sliderStyle">@style/YuzuSlider</item>
 
         <item name="android:windowLayoutInDisplayCutoutMode">default</item>
-    </style>
 
-    <!-- Trick for API >= 29 specific changes -->
-    <style name="Theme.Yuzu.Main" parent="Theme.Yuzu" />
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+    </style>
 
 </resources>
-- 
cgit v1.2.3