summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2012-04-12 12:58:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-12 12:58:27 -0700
commit02c6cad7c49942336ed6a8fe015c0cb4eced0c82 (patch)
treeec530a7f4654e990c755aeb48677acf1f9dda7ba /core/java/android
parent9a00e8f138b13b551a96104675c93035ea1eface (diff)
parent6971153d88ebe2e441b75081a273b88424498a45 (diff)
downloadframeworks_base-02c6cad7c49942336ed6a8fe015c0cb4eced0c82.zip
frameworks_base-02c6cad7c49942336ed6a8fe015c0cb4eced0c82.tar.gz
frameworks_base-02c6cad7c49942336ed6a8fe015c0cb4eced0c82.tar.bz2
am 6971153d: Merge "docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537" into ics-mr1
* commit '6971153d88ebe2e441b75081a273b88424498a45': docs: Fixed method description for onKeyDown(int keyCode, KeyEvent event). Bug: 6318537
Diffstat (limited to 'core/java/android')
-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 53cdf21..2b55f27 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