Commit f2f7d778 authored by topjohnwu's avatar topjohnwu

Fix language settings UI

parent b2105f2d
...@@ -201,13 +201,9 @@ public class SettingsActivity extends Activity implements Topic.Subscriber { ...@@ -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 { ...@@ -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
......
...@@ -10,6 +10,10 @@ ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment