summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-04-21 20:25:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-21 20:25:03 +0000
commit49d8fa473970265a182549cc1673719e5101320e (patch)
treedb8a5e93936cf9779edaf64c9b1ee7180619b2a5
parent4660c9e064ebaec9ebb260c2853a8dab868ccdc2 (diff)
parenta281be67030a834d455a84ce62c173140564211a (diff)
downloadframeworks_base-49d8fa473970265a182549cc1673719e5101320e.zip
frameworks_base-49d8fa473970265a182549cc1673719e5101320e.tar.gz
frameworks_base-49d8fa473970265a182549cc1673719e5101320e.tar.bz2
am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev
* commit 'a281be67030a834d455a84ce62c173140564211a': Allow InputEvents to propagate w/o IME
-rw-r--r--core/java/android/view/ViewRootImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4e4f37b..097dff0 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3722,7 +3722,8 @@ public final class ViewRootImpl implements ViewParent,
if (result == InputMethodManager.DISPATCH_HANDLED) {
return FINISH_HANDLED;
} else if (result == InputMethodManager.DISPATCH_NOT_HANDLED) {
- return FINISH_NOT_HANDLED;
+ // The IME could not handle it, so skip along to the next InputStage
+ return FORWARD;
} else {
return DEFER; // callback will be invoked later
}