From 18ba0f1345daf6ca66e314b1f70250c3e10bb8df Mon Sep 17 00:00:00 2001
From: Crimson-Hawk <crimson.hawk@suyu.dev>
Date: Sat, 23 Mar 2024 19:20:40 +0800
Subject: [PATCH] Revert "Merge branch 'XForYouX-dev' into dev"
this broke android build
This reverts commit 16841915fd0dcf7d72f8be66318ae67c01b61717, reversing
changes made to c7d2f08de8bb51e323e95211f4553872b565b432.
---
src/android/app/src/main/res/values/arrays.xml | 2 --
src/android/app/src/main/res/values/strings.xml | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 0500bb2a4f..1bd6455b4c 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -142,7 +142,6 @@
<item>@string/ratio_force_four_three</item>
<item>@string/ratio_force_twenty_one_nine</item>
<item>@string/ratio_force_sixteen_ten</item>
- <item>@string/ratio_thirty_two_nine</item>
<item>@string/ratio_stretch</item>
</string-array>
@@ -152,7 +151,6 @@
<item>2</item>
<item>3</item>
<item>4</item>
- <item>5</item>
</integer-array>
<string-array name="rendererScalingFilterNames">
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 5331f2b419..a2487f4f11 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -601,7 +601,6 @@
<string name="ratio_force_four_three">Force 4:3</string>
<string name="ratio_force_twenty_one_nine">Force 21:9</string>
<string name="ratio_force_sixteen_ten">Force 16:10</string>
- <string name="ratio_force_thirty_two_nine">Force 32:9</string>
<string name="ratio_stretch">Stretch to window</string>
<!-- CPU Backend -->
--
GitLab