diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-01-05 19:28:06 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-01-05 19:28:06 -0800 |
| commit | 3c8b26a71fe3a24e5749ca446c43a1f675b6bd48 (patch) | |
| tree | 824dc1a27bcb9ff35c665c316a9982c0a71f1955 /java/src/com/android | |
| parent | c6f0674c6fea828c8057bca3e809afaa01212728 (diff) | |
| parent | 3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42 (diff) | |
| download | latinime-3c8b26a71fe3a24e5749ca446c43a1f675b6bd48.tar.gz latinime-3c8b26a71fe3a24e5749ca446c43a1f675b6bd48.tar.xz latinime-3c8b26a71fe3a24e5749ca446c43a1f675b6bd48.zip | |
am 3f8c6b8c: Merge "Add description of disabled voice input key option"
* commit '3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42':
Add description of disabled voice input key option
Diffstat (limited to 'java/src/com/android')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsFragment.java | 10 |
1 files changed, 8 insertions, 2 deletions
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) { |