You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2015/12/16 22:26:08 UTC

android commit: CB-9949: Fixing menu button event not fired in Android

Repository: cordova-android
Updated Branches:
  refs/heads/master 70bc7b39b -> b6a329d47


CB-9949: Fixing menu button event not fired in Android

This closes 246


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b6a329d4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b6a329d4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b6a329d4

Branch: refs/heads/master
Commit: b6a329d479e15cdf8a7a30a8fea9c5799c73841a
Parents: 70bc7b3
Author: Keith Wong <ke...@objectvalley.com>
Authored: Wed Dec 16 18:43:19 2015 +0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Dec 16 13:25:19 2015 -0800

----------------------------------------------------------------------
 framework/src/org/apache/cordova/CordovaWebViewImpl.java | 1 +
 framework/src/org/apache/cordova/CoreAndroid.java        | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b6a329d4/framework/src/org/apache/cordova/CordovaWebViewImpl.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebViewImpl.java b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
index 59a0de7..f83e487 100644
--- a/framework/src/org/apache/cordova/CordovaWebViewImpl.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
@@ -354,6 +354,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
             case KeyEvent.KEYCODE_VOLUME_DOWN:
             case KeyEvent.KEYCODE_VOLUME_UP:
             case KeyEvent.KEYCODE_BACK:
+            case KeyEvent.KEYCODE_MENU:
                 // TODO: Why are search and menu buttons handled separately?
                 if (override) {
                     boundKeyCodes.add(keyCode);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b6a329d4/framework/src/org/apache/cordova/CoreAndroid.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CoreAndroid.java b/framework/src/org/apache/cordova/CoreAndroid.java
index 90d079e..0266336 100755
--- a/framework/src/org/apache/cordova/CoreAndroid.java
+++ b/framework/src/org/apache/cordova/CoreAndroid.java
@@ -252,6 +252,9 @@ class CoreAndroid extends CordovaPlugin {
         else if (button.equals("volumedown")) {
             webView.setButtonPlumbedToJs(KeyEvent.KEYCODE_VOLUME_DOWN, override);
         }
+        else if (button.equals("menubutton")) {
+            webView.setButtonPlumbedToJs(KeyEvent.KEYCODE_MENU, override);
+        }
     }
 
     /**


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org