aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-07 06:20:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-07 06:20:07 +0000
commit7286667754f516ae24e34e033f15e9f5b6fcd279 (patch)
treec034879eba91e3be23ee4a7b5352ee6082e3ad2a /java/src/com/android/inputmethod/latin/LatinIME.java
parent51d0b3351b2530173cdf73d1a9b364c916583999 (diff)
parent8a2c4afad4c30fe7c082387b4beafd95c3c823e8 (diff)
downloadlatinime-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/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
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();
}