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/PreferencesSettingsFragment.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/PreferencesSettingsFragment.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java index 49db2bdc0..c0ceb8857 100644 --- a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java @@ -24,7 +24,7 @@ import android.preference.Preference; import com.android.inputmethod.latin.AudioAndHapticFeedbackManager; import com.android.inputmethod.latin.R; -import com.android.inputmethod.latin.SubtypeSwitcher; +import com.android.inputmethod.latin.RichInputMethodManager; /** * "Preferences" settings sub screen. @@ -49,7 +49,7 @@ public final class PreferencesSettingsFragment extends SubScreenFragment { // When we are called from the Settings application but we are not already running, some // singleton and utility classes may not have been initialized. We have to call // initialization method of these classes here. See {@link LatinIME#onCreate()}. - SubtypeSwitcher.init(context); + RichInputMethodManager.init(context); final boolean showVoiceKeyOption = res.getBoolean( R.bool.config_enable_show_voice_key_option); @@ -71,7 +71,7 @@ public final class PreferencesSettingsFragment extends SubScreenFragment { super.onResume(); final Preference voiceInputKeyOption = findPreference(Settings.PREF_VOICE_INPUT_KEY); if (voiceInputKeyOption != null) { - final boolean isShortcutImeEnabled = SubtypeSwitcher.getInstance() + final boolean isShortcutImeEnabled = RichInputMethodManager.getInstance() .isShortcutImeEnabled(); voiceInputKeyOption.setEnabled(isShortcutImeEnabled); voiceInputKeyOption.setSummary( |