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/SettingsValues.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/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 9a1bb7784..e523246f3 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -28,6 +28,7 @@ import com.android.inputmethod.compat.AppWorkaroundsUtils; import com.android.inputmethod.latin.InputAttributes; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodManager; +import com.android.inputmethod.latin.common.Constants; import com.android.inputmethod.latin.utils.AsyncResultHolder; import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask; @@ -136,7 +137,7 @@ public class SettingsValues { DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res) && mInputAttributes.mShouldShowVoiceInputKey - && RichInputMethodManager.getInstance().isShortcutImeEnabled(); + && Constants.JELLY_BEAN_OR_HIGHER; final String autoCorrectionThresholdRawValue = prefs.getString( Settings.PREF_AUTO_CORRECTION_THRESHOLD, res.getString(R.string.auto_correction_threshold_mode_index_modest)); |