summaryrefslogtreecommitdiffstats
path: root/core/java/android/inputmethodservice
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2012-04-12 13:01:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-12 13:01:00 -0700
commit4f8b71e41d26538711920495242892839a1757f9 (patch)
tree556bb574e2120c018d7332ae76f3b1727ca583f7 /core/java/android/inputmethodservice
parent95487eb90ce8c421ce7baca5b761745bbc1bb14b (diff)
parenta97a7b5a6efac20a112c1833579a0a2b17bc058e (diff)
downloadframeworks_base-4f8b71e41d26538711920495242892839a1757f9.zip
frameworks_base-4f8b71e41d26538711920495242892839a1757f9.tar.gz
frameworks_base-4f8b71e41d26538711920495242892839a1757f9.tar.bz2
am a97a7b5a: am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit 'a97a7b5a6efac20a112c1833579a0a2b17bc058e': docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537
Diffstat (limited to 'core/java/android/inputmethodservice')
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index ba7dc4a..332f40a 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1712,8 +1712,8 @@ public class InputMethodService extends AbstractInputMethodService {
/**
* Override this to intercept key down events before they are processed by the
- * application. If you return true, the application will not itself
- * process the event. If you return true, the normal application processing
+ * application. If you return true, the application will not
+ * process the event itself. If you return false, the normal application processing
* will occur as if the IME had not seen the event at all.
*
* <p>The default implementation intercepts {@link KeyEvent#KEYCODE_BACK