diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-01-06 03:25:15 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-01-06 03:25:15 +0000 |
| commit | 3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42 (patch) | |
| tree | 824dc1a27bcb9ff35c665c316a9982c0a71f1955 /java | |
| parent | e91559a1197e794f3c41e442900907a680d0c91d (diff) | |
| parent | 12ba821bfb39f45a529959187e7fd7b950e9ef62 (diff) | |
| download | latinime-3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42.tar.gz latinime-3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42.tar.xz latinime-3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42.zip | |
Merge "Add description of disabled voice input key option"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index f618473bd..8e8a13f9b 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -249,6 +249,8 @@ <!-- Preferences item for enabling speech input --> <string name="voice_input">Voice input key</string> + <!-- The summary text to describe the reason why the "Voice input key" option is disabled. [CHAR LIMIT=100] --> + <string name="voice_input_disabled_summary">No voice input methods enabled. Check Language & input settings.</string> <!-- Title for configuring input method settings [CHAR LIMIT=35] --> <string name="configure_input_method">Configure input methods</string> diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java index e1182e4ff..67017a43b 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java @@ -238,8 +238,14 @@ public final class SettingsFragment extends InputMethodSettingsFragment super.onResume(); final SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); final Resources res = getResources(); - final boolean isShortcutImeEnabled = SubtypeSwitcher.getInstance().isShortcutImeEnabled(); - setPreferenceEnabled(Settings.PREF_VOICE_INPUT_KEY, isShortcutImeEnabled); + final Preference voiceInputKeyOption = findPreference(Settings.PREF_VOICE_INPUT_KEY); + if (voiceInputKeyOption != null) { + final boolean isShortcutImeEnabled = SubtypeSwitcher.getInstance() + .isShortcutImeEnabled(); + voiceInputKeyOption.setEnabled(isShortcutImeEnabled); + voiceInputKeyOption.setSummary(isShortcutImeEnabled ? null + : res.getText(R.string.voice_input_disabled_summary)); + } final CheckBoxPreference showSetupWizardIcon = (CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON); if (showSetupWizardIcon != null) { |