summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhishek G <agilra@cyngn.com>2016-05-04 12:28:07 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-05 14:17:15 -0700
commit72f827ac4d5514a2de48cc6d3e12820d676be5eb (patch)
tree644cb8fb3465253ec0cad5da6885e42d1d8f297e
parent8a1a13a03b2d48e51d7b36e7592793422a791350 (diff)
downloadandroid_packages_apps_Dialer-72f827ac4d5514a2de48cc6d3e12820d676be5eb.tar.gz
android_packages_apps_Dialer-72f827ac4d5514a2de48cc6d3e12820d676be5eb.tar.bz2
android_packages_apps_Dialer-72f827ac4d5514a2de48cc6d3e12820d676be5eb.zip
Feijao: empty string is not a valid locale
Empty string is not a valid locale. Setting the default locale to english (en). Change-Id: I7bc524dbb4aa65d31f1bb33fa5e8fadf4770fbaf Issue-Id: FEIJ-306, CD-620
-rw-r--r--src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java b/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java
index ad11ac0de..902fdd7c8 100644
--- a/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java
+++ b/src/com/android/dialer/settings/DisplayOptionsSettingsFragment.java
@@ -87,7 +87,7 @@ public class DisplayOptionsSettingsFragment extends PreferenceFragment
String[] values = new String[len];
entries[0] = getString(R.string.t9_search_input_locale_default);
- values[0] = "";
+ values[0] = Locale.getDefault().getLanguage();
// add locales programatically so we can use locale.getDisplayName
for (int i = 0; i < T9_SEARCH_INPUT_LOCALES.length; i++) {
@@ -105,5 +105,8 @@ public class DisplayOptionsSettingsFragment extends PreferenceFragment
mT9SearchInputLocale.setEntries(entries);
mT9SearchInputLocale.setEntryValues(values);
+ if (mT9SearchInputLocale.getValue().equals("")) {
+ mT9SearchInputLocale.setValueIndex(0);
+ }
}
}