diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-02-17 16:37:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-17 16:37:27 -0800 |
| commit | c8fd872e56c90086df5998aa385e7bece860df00 (patch) | |
| tree | 606e40aa1fa2a6f9286d0e97c05b4c53caeaf4fb | |
| parent | 8a7e63a0a9e752990f195880d462166904f72476 (diff) | |
| parent | 0f2e6dec7c8dc136783eacb5b62c9d3248c4845a (diff) | |
| download | packages_apps_settings-c8fd872e56c90086df5998aa385e7bece860df00.zip packages_apps_settings-c8fd872e56c90086df5998aa385e7bece860df00.tar.gz packages_apps_settings-c8fd872e56c90086df5998aa385e7bece860df00.tar.bz2 | |
Merge "Show current locale as summary for Select language setting."
| -rw-r--r-- | res/xml/language_settings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/LanguageSettings.java | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index 47eb795..d3c0e02 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -18,8 +18,8 @@ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> <PreferenceScreen - android:title="@string/phone_language" - android:summary="@string/phone_language_summary"> + android:key="phone_language" + android:title="@string/phone_language"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.LocalePicker"/> diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java index 1b9f0c1..61ede0d 100644 --- a/src/com/android/settings/LanguageSettings.java +++ b/src/com/android/settings/LanguageSettings.java @@ -43,10 +43,12 @@ import java.util.List; public class LanguageSettings extends PreferenceActivity { + private static final String KEY_PHONE_LANGUAGE = "phone_language"; private boolean mHaveHardKeyboard; private List<InputMethodInfo> mInputMethodProperties; private List<CheckBoxPreference> mCheckboxes; + private Preference mLanguagePref; final TextUtils.SimpleStringSplitter mStringColonSplitter = new TextUtils.SimpleStringSplitter(':'); @@ -67,6 +69,8 @@ public class LanguageSettings extends PreferenceActivity { if (getAssets().getLocales().length == 1) { getPreferenceScreen(). removePreference(findPreference("language_category")); + } else { + mLanguagePref = findPreference(KEY_PHONE_LANGUAGE); } Configuration config = getResources().getConfiguration(); @@ -156,6 +160,15 @@ public class LanguageSettings extends PreferenceActivity { } } mLastTickedInputMethodId = null; + + if (mLanguagePref != null) { + Configuration conf = getResources().getConfiguration(); + String locale = conf.locale.getDisplayName(conf.locale); + if (locale != null && locale.length() > 1) { + locale = Character.toUpperCase(locale.charAt(0)) + locale.substring(1); + mLanguagePref.setSummary(locale); + } + } } @Override |