diff options
| -rw-r--r-- | src/com/android/phone/common/dialpad/DialpadView.java | 1 | ||||
| -rw-r--r-- | src/com/android/phone/common/util/SettingsUtil.java | 16 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/com/android/phone/common/dialpad/DialpadView.java b/src/com/android/phone/common/dialpad/DialpadView.java index 3911093..edef84e 100644 --- a/src/com/android/phone/common/dialpad/DialpadView.java +++ b/src/com/android/phone/common/dialpad/DialpadView.java @@ -174,6 +174,7 @@ public class DialpadView extends LinearLayout { dialpadKey = (DialpadKeyButton) findViewById(mButtonIds[i]); numberView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_number); lettersView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_letters); + letters2View = (TextView) dialpadKey.findViewById(R.id.dialpad_key2_letters); labelsView = (TextView) dialpadKey.findViewById(R.id.dialpad_key_labels); final String numberString; diff --git a/src/com/android/phone/common/util/SettingsUtil.java b/src/com/android/phone/common/util/SettingsUtil.java index d2fd58b..9be36d7 100644 --- a/src/com/android/phone/common/util/SettingsUtil.java +++ b/src/com/android/phone/common/util/SettingsUtil.java @@ -104,20 +104,6 @@ public class SettingsUtil { public static Locale getT9SearchInputLocale(Context context) { // Use system locale by default - Locale locale = context.getResources().getConfiguration().locale; - - // Override with t9 search input locale from settings if provided - String overrideLocaleString = android.provider.Settings.System.getString( - context.getContentResolver(), - android.provider.Settings.System.T9_SEARCH_INPUT_LOCALE); - if (overrideLocaleString != null && !overrideLocaleString.isEmpty()) { - String[] tokens = overrideLocaleString.split("_"); - String lang = tokens.length > 0 ? tokens[0] : ""; - String country = tokens.length > 1 ? tokens[1] : ""; - String variant = tokens.length > 2 ? tokens[2] : ""; - locale = new Locale(lang, country, variant); - } - - return locale; + return context.getResources().getConfiguration().locale; } } |