nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3f8c6b8c: Merge "Add description of disabled voice input key option" 

* commit '3f8c6b8c54b6a0cf15da10c3c2fcf80c9af27c42':
  Add description of disabled voice input key option
main
Tadashi G. Takaoka 2014-01-05 19:28:06 -08:00 committed by Android Git Automerger
parent c6f0674c6f 3f8c6b8c54
commit 3c8b26a71f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/values/strings.xml
View File

@ -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 &amp; input settings.</string>
<!-- Title for configuring input method settings [CHAR LIMIT=35] -->
<string name="configure_input_method">Configure input methods</string>

10
java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
View File

@ -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) {