summaryrefslogtreecommitdiff
path: root/core/java/android/app
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-03-26 19:46:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-26 19:46:20 -0700
commit901b77c63bc707c5785a149975e2113a43e38ad6 (patch)
tree2766b887f99e37bcdc423ecf668b7ad6ee58d609 /core/java/android/app
parent483ac9a779af452d7ef4007d0e24c569ee894557 (diff)
parentca3d655d20c13c71972a4475cec3b98efa7dbdd0 (diff)
am ca3d655d: Merge "Use input transport for communications between app and IME." into jb-mr2-dev
* commit 'ca3d655d20c13c71972a4475cec3b98efa7dbdd0': Use input transport for communications between app and IME.
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/NativeActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java
index 396f910e6954..51867bcab693 100644
--- a/core/java/android/app/NativeActivity.java
+++ b/core/java/android/app/NativeActivity.java
@@ -353,8 +353,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2,
}
void preDispatchKeyEvent(KeyEvent event, int seq) {
- mIMM.dispatchKeyEvent(this, seq, event,
- mInputMethodCallback);
+ mIMM.dispatchInputEvent(this, seq, event, mInputMethodCallback);
}
void setWindowFlags(int flags, int mask) {