From ea5265c077e09c8b6985c6757412b0c326df23ab Mon Sep 17 00:00:00 2001 From: Firefly Date: Wed, 3 Jun 2015 16:31:10 +0800 Subject: [PATCH] [packages/apps/Settings] Settings: set language according to SIM Add a setting in Language settings to enable of disable this function Issue: GRANITEFLY-745 Change-Id: Ibcdedc20bb629c5757f086fa88cf85cc3dfc5598 --- .../res/values-zh-rCN/strings_intel.xml | 22 ++++++++++++ .../res/values-zh-rTW/strings_intel.xml | 22 ++++++++++++ .../Settings/res/values/strings_intel.xml | 22 ++++++++++++ .../Settings/res/xml/language_settings.xml | 6 ++++ .../InputMethodAndLanguageSettings.java | 36 +++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 packages/apps/Settings/res/values-zh-rCN/strings_intel.xml create mode 100644 packages/apps/Settings/res/values-zh-rTW/strings_intel.xml create mode 100644 packages/apps/Settings/res/values/strings_intel.xml diff --git a/packages/apps/Settings/res/values-zh-rCN/strings_intel.xml b/packages/apps/Settings/res/values-zh-rCN/strings_intel.xml new file mode 100644 index 0000000000..996a8c0851 --- /dev/null +++ b/packages/apps/Settings/res/values-zh-rCN/strings_intel.xml @@ -0,0 +1,22 @@ + + + + + 自动确定语言 + 根据SIM卡国家码自动确定系统语言 + 根据SIM卡国家码自动确定系统语言 + diff --git a/packages/apps/Settings/res/values-zh-rTW/strings_intel.xml b/packages/apps/Settings/res/values-zh-rTW/strings_intel.xml new file mode 100644 index 0000000000..c3be6abb35 --- /dev/null +++ b/packages/apps/Settings/res/values-zh-rTW/strings_intel.xml @@ -0,0 +1,22 @@ + + + + + 自動確定語言 + 根據SIM卡國家碼自動確定系統語言 + 根據SIM卡國家碼自動確定系統語言 + diff --git a/packages/apps/Settings/res/values/strings_intel.xml b/packages/apps/Settings/res/values/strings_intel.xml new file mode 100644 index 0000000000..d40c5b06ef --- /dev/null +++ b/packages/apps/Settings/res/values/strings_intel.xml @@ -0,0 +1,22 @@ + + + + + Automatic Language + Auto set language according to SIM card country code info + Auto set language according to SIM card country code info + diff --git a/packages/apps/Settings/res/xml/language_settings.xml b/packages/apps/Settings/res/xml/language_settings.xml index 5cc8a4ae1d..6a0b549aaa 100644 --- a/packages/apps/Settings/res/xml/language_settings.xml +++ b/packages/apps/Settings/res/xml/language_settings.xml @@ -19,6 +19,12 @@ android:key="language_keyboard_settings" android:title="@string/language_keyboard_settings_title"> + + 0; + return autoEnabled; + } + private class SettingsObserver extends ContentObserver { private Context mContext;