aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-12-07 05:43:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-07 05:43:32 -0800
commit658a1dffcb707acd15207ad6181fe0384d4db1ae (patch)
treecbff734bf2721501bd7c4b531a69b08f241ce0e6 /java/src/com/android/inputmethod/latin/LatinIME.java
parent6f461a6a500248a9d20fd1ba76eba77272fecf4f (diff)
parent6b7100fecaaaf0e8e42c4d2ccebac165e89e79bf (diff)
downloadlatinime-658a1dffcb707acd15207ad6181fe0384d4db1ae.tar.gz
latinime-658a1dffcb707acd15207ad6181fe0384d4db1ae.tar.xz
latinime-658a1dffcb707acd15207ad6181fe0384d4db1ae.zip
am 6b7100fe: Don\'t execute pending onStartInputView if EditorInfos are equivalent
* commit '6b7100fecaaaf0e8e42c4d2ccebac165e89e79bf': Don't execute pending onStartInputView if EditorInfos are equivalent
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, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5f446a5c4..c2656b891 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -62,6 +62,7 @@ import com.android.inputmethod.deprecated.VoiceProxy;
import com.android.inputmethod.keyboard.Key;
import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.keyboard.KeyboardActionListener;
+import com.android.inputmethod.keyboard.KeyboardId;
import com.android.inputmethod.keyboard.KeyboardSwitcher;
import com.android.inputmethod.keyboard.KeyboardView;
import com.android.inputmethod.keyboard.LatinKeyboard;
@@ -442,7 +443,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
public void onStartInputView(EditorInfo editorInfo, boolean restarting) {
- if (hasMessages(MSG_PENDING_IMS_CALLBACK) && editorInfo == mAppliedEditorInfo) {
+ if (hasMessages(MSG_PENDING_IMS_CALLBACK)
+ && KeyboardId.equivalentEditorInfoForKeyboard(editorInfo, mAppliedEditorInfo)) {
// Typically this is the second onStartInputView after orientation changed.
resetPendingImsCallback();
} else {