From 12d80ebead6a1d7f704a5a3af3b6fe3313ceab05 Mon Sep 17 00:00:00 2001 From: Dan Zivkovic Date: Tue, 10 Feb 2015 14:54:38 -0800 Subject: Remove shortcut support from LatinIME. Note this change does not affect the native decoder interface. Change-Id: I73b7dc008a5acaf75a31a36a2d332b5afabd82d0 --- .../inputmethod/latin/settings/PreferencesSettingsFragment.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java') 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)); } } -- cgit v1.2.3-83-g751a