Permalink
Browse files

Fix for CB-1960, we now check to see if any view is on the WebView, s…

…ince they won't always be custom
  • Loading branch information...
infil00p committed Dec 4, 2012
1 parent c0ee593 commit 8a19769a473bc1ae267caac3f5e0781432b33c89
Showing with 3 additions and 1 deletion.
  1. +3 −1 framework/src/org/apache/cordova/DroidGap.java
@@ -1008,8 +1008,10 @@ public void run() {
@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);

0 comments on commit 8a19769

Please sign in to comment.