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/LatinIME.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/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index eb0037e8c..1d00c1c64 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1424,7 +1424,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen // completely replace #onCodeInput. public void onEvent(@Nonnull final Event event) { if (Constants.CODE_SHORTCUT == event.mKeyCode) { - mSubtypeSwitcher.switchToShortcutIME(this); + mRichImm.switchToShortcutIME(this); } final InputTransaction completeInputTransaction = mInputLogic.onCodeInput(mSettings.getCurrent(), event, @@ -1811,7 +1811,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen public void onReceive(final Context context, final Intent intent) { final String action = intent.getAction(); if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) { - mSubtypeSwitcher.onNetworkStateChanged(intent); + mRichImm.onNetworkStateChanged(intent); } else if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) { AudioAndHapticFeedbackManager.getInstance().onRingerModeChanged(); } |