diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-07 06:23:46 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 06:23:46 +0000 |
| commit | d134eb2b7e77656943a7b268c6ce43bbec8af2bd (patch) | |
| tree | 9d5334860c1625b19221e96d10a033a91af15f1f /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 8c6c5a1ffc55679a06b85602f9c16d5d5fad469c (diff) | |
| parent | 7286667754f516ae24e34e033f15e9f5b6fcd279 (diff) | |
| download | latinime-d134eb2b7e77656943a7b268c6ce43bbec8af2bd.tar.gz latinime-d134eb2b7e77656943a7b268c6ce43bbec8af2bd.tar.xz latinime-d134eb2b7e77656943a7b268c6ce43bbec8af2bd.zip | |
am 72866677: Merge "Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager"
* commit '7286667754f516ae24e34e033f15e9f5b6fcd279':
Move shorcut IME related code from SubtypeSwitcher to RichInputMethodManager
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, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index 509b41fd3..26415e7d4 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -28,7 +28,6 @@ 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.SubtypeSwitcher; import com.android.inputmethod.latin.utils.AsyncResultHolder; import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask; @@ -140,7 +139,7 @@ public class SettingsValues { DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW, true); mShowsVoiceInputKey = needsToShowVoiceInputKey(prefs, res) && mInputAttributes.mShouldShowVoiceInputKey - && SubtypeSwitcher.getInstance().isShortcutImeEnabled(); + && RichInputMethodManager.getInstance().isShortcutImeEnabled(); final String autoCorrectionThresholdRawValue = prefs.getString( Settings.PREF_AUTO_CORRECTION_THRESHOLD, res.getString(R.string.auto_correction_threshold_mode_index_modest)); |