diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-02-11 21:11:52 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 21:11:52 +0000 |
| commit | fe674a441f0ece3d772acba01be09a0a0d8ff5ce (patch) | |
| tree | 5ba9d889102387b0b356045dbe1a6ec50c40fda4 /java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java | |
| parent | 1c7d6283fcefb37d1f7ac35a1ded0b705225ccdd (diff) | |
| parent | 12d80ebead6a1d7f704a5a3af3b6fe3313ceab05 (diff) | |
| download | latinime-fe674a441f0ece3d772acba01be09a0a0d8ff5ce.tar.gz latinime-fe674a441f0ece3d772acba01be09a0a0d8ff5ce.tar.xz latinime-fe674a441f0ece3d772acba01be09a0a0d8ff5ce.zip | |
am 12d80ebe: Remove shortcut support from LatinIME.
* commit '12d80ebead6a1d7f704a5a3af3b6fe3313ceab05':
Remove shortcut support from LatinIME.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java index 975396d2d..c5e80f249 100644 --- a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java @@ -25,6 +25,7 @@ import android.preference.Preference; import com.android.inputmethod.latin.AudioAndHapticFeedbackManager; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodManager; +import com.android.inputmethod.latin.common.Constants; /** * "Preferences" settings sub screen. @@ -72,11 +73,9 @@ public final class PreferencesSettingsFragment extends SubScreenFragment { final Preference voiceInputKeyOption = findPreference(Settings.PREF_VOICE_INPUT_KEY); if (voiceInputKeyOption != null) { RichInputMethodManager.getInstance().refreshSubtypeCaches(); - final boolean isShortcutImeEnabled = RichInputMethodManager.getInstance() - .isShortcutImeEnabled(); - voiceInputKeyOption.setEnabled(isShortcutImeEnabled); - voiceInputKeyOption.setSummary( - isShortcutImeEnabled ? null : getText(R.string.voice_input_disabled_summary)); + voiceInputKeyOption.setEnabled(Constants.JELLY_BEAN_OR_HIGHER); + voiceInputKeyOption.setSummary(Constants.JELLY_BEAN_OR_HIGHER + ? null : getText(R.string.voice_input_disabled_summary)); } } |