From 8a19769a473bc1ae267caac3f5e0781432b33c89 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Tue, 4 Dec 2012 09:40:57 -0800 Subject: [PATCH] Fix for CB-1960, we now check to see if any view is on the WebView, since they won't always be custom --- framework/src/org/apache/cordova/DroidGap.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java index 7d9b6d12..11c3a5f4 100755 --- a/framework/src/org/apache/cordova/DroidGap.java +++ b/framework/src/org/apache/cordova/DroidGap.java @@ -1008,8 +1008,10 @@ public class DroidGap extends Activity implements CordovaInterface { @Override public boolean onKeyUp(int keyCode, KeyEvent event) { + //Get whatever has focus! + View childView = appView.getFocusedChild(); //Determine if the focus is on the current view or not - if (appView.getHitTestResult() != null && + if (appView.getHitTestResult() != null && childView == null && appView.getHitTestResult().getType() == WebView.HitTestResult.EDIT_TEXT_TYPE && (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU)) { return appView.onKeyUp(keyCode, event);