Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: settings: Disable 'System Default' theme for pre-Android 10.

Browse Source 
- It's not officially supported.
This commit is contained in:
bunnei 2020-04-24 20:23:22 -04:00
parent 66cf6fefb8
commit c785282b26
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
View File

@ -145,7 +145,13 @@ public final class SettingsFragmentPresenter {
Setting design = premiumSection.getSetting(SettingsFile.KEY_DESIGN); Setting design = premiumSection.getSetting(SettingsFile.KEY_DESIGN);
sl.add(new PremiumHeader()); sl.add(new PremiumHeader());
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
sl.add(new PremiumSingleChoiceSetting(SettingsFile.KEY_DESIGN, Settings.SECTION_PREMIUM, R.string.design, 0, R.array.designNames, R.array.designValues, 0, design, mView)); sl.add(new PremiumSingleChoiceSetting(SettingsFile.KEY_DESIGN, Settings.SECTION_PREMIUM, R.string.design, 0, R.array.designNames, R.array.designValues, 0, design, mView));
} else {
// Pre-Android 10 does not support System Default
sl.add(new PremiumSingleChoiceSetting(SettingsFile.KEY_DESIGN, Settings.SECTION_PREMIUM, R.string.design, 0, R.array.designNamesOld, R.array.designValuesOld, 0, design, mView));
}
} }
private void addGeneralSettings(ArrayList<SettingsItem> sl) { private void addGeneralSettings(ArrayList<SettingsItem> sl) {

12
src/android/app/src/main/res/values/arrays.xml
View File

@ -24,6 +24,18 @@
<item>2</item> <item>2</item>
</integer-array> </integer-array>
<!-- Pre-Android 10 does not support System Default -->
<string-array name="designNamesOld" translatable="true">
<item>Light</item>
<item>Dark</item>
</string-array>
<!-- Pre-Android 10 does not support System Default -->
<integer-array name="designValuesOld" translatable="false">
<item>0</item>
<item>1</item>
</integer-array>
<string-array name="regionNames"> <string-array name="regionNames">
<item>Auto-select</item> <item>Auto-select</item>
<item>Japan</item> <item>Japan</item>