diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-07 06:20:05 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-11-07 06:20:07 +0000 |
| commit | 7286667754f516ae24e34e033f15e9f5b6fcd279 (patch) | |
| tree | c034879eba91e3be23ee4a7b5352ee6082e3ad2a /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | 51d0b3351b2530173cdf73d1a9b364c916583999 (diff) | |
| parent | 8a2c4afad4c30fe7c082387b4beafd95c3c823e8 (diff) | |
| download | latinime-7286667754f516ae24e34e033f15e9f5b6fcd279.tar.gz latinime-7286667754f516ae24e34e033f15e9f5b6fcd279.tar.xz latinime-7286667754f516ae24e34e033f15e9f5b6fcd279.zip | |
Merge "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)); |