MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix language settings UI

Browse Source
This commit is contained in:
topjohnwu 2018-06-03 11:50:12 +08:00
parent b2105f2d88
commit f2f7d77847
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/full/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@ -201,13 +201,9 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
} }
private void setLocalePreference(ListPreference lp) { private void setLocalePreference(ListPreference lp) {
boolean isNew = lp == null;
if (isNew) {
lp = new ListPreference(getActivity());
}
CharSequence[] entries = new CharSequence[mm.locales.size() + 1]; CharSequence[] entries = new CharSequence[mm.locales.size() + 1];
CharSequence[] entryValues = new CharSequence[mm.locales.size() + 1]; CharSequence[] entryValues = new CharSequence[mm.locales.size() + 1];
entries[0] = getString(R.string.system_default); entries[0] = Utils.getLocaleString(MagiskManager.defaultLocale, R.string.system_default);
entryValues[0] = ""; entryValues[0] = "";
int i = 1; int i = 1;
for (Locale locale : mm.locales) { for (Locale locale : mm.locales) {
@ -216,12 +212,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
} }
lp.setEntries(entries); lp.setEntries(entries);
lp.setEntryValues(entryValues); lp.setEntryValues(entryValues);
lp.setTitle(R.string.language);
lp.setKey(Const.Key.LOCALE);
lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale)); lp.setSummary(MagiskManager.locale.getDisplayName(MagiskManager.locale));
if (isNew) {
generalCatagory.addPreference(lp);
}
} }
@Override @Override

4
src/full/res/xml/app_settings.xml
View File

@ -10,6 +10,10 @@
android:title="@string/settings_dark_theme_title" android:title="@string/settings_dark_theme_title"
android:summary="@string/settings_dark_theme_summary" /> android:summary="@string/settings_dark_theme_summary" />
<ListPreference
android:key="locale"
android:title="@string/language"/>
<Preference <Preference
android:key="clear" android:key="clear"
android:title="@string/settings_clear_cache_title" android:title="@string/settings_clear_cache_title"