CB-1795: onCreateOptionsMenu in PhoneGap 2.2.0 Release Candidate 2 isn't working anymore

Tagging the 2.2.0 release after this commit
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android
2026-03-04 00:01:36 +08:00 · 2012-11-01 10:30:34 -04:00 · 2012-10-31 10:57:57 -07:00 · 2012-10-29 16:23:36 -04:00 · 2012-10-29 16:21:12 -04:00 · 2012-10-29 16:21:12 -04:00
7 changed files with 18 additions and 13 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.2.0rc2
+2.2.0
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -33,7 +33,7 @@
                <p class="event received">Device is Ready</p>
            </div>
        </div>
-        <script type="text/javascript" src="cordova-2.2.0rc2.js"></script>
+        <script type="text/javascript" src="cordova-2.2.0.js"></script>
        <script type="text/javascript" src="js/index.js"></script>
        <script type="text/javascript">
            app.initialize();
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,6 +1,6 @@
-// commit d819e1e60599c12ac831379b06bba9110e9f1790
+// commit 02b91c5313ff37d74a58f71775170afd360f4a1f

-// File generated at :: Fri Oct 26 2012 16:03:51 GMT-0400 (EDT)
+// File generated at :: Wed Oct 31 2012 10:40:25 GMT-0700 (PDT)

 /*
 Licensed to the Apache Software Foundation (ASF) under one
@@ -2850,7 +2850,7 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro
        errorCallback(error);
    };

-    exec(win, errorCallback, 'FileTransfer', 'download', [source, target, trustAllHosts, this._id]);
+    exec(win, fail, 'FileTransfer', 'download', [source, target, trustAllHosts, this._id]);
 };

 /**
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
  <head>
    <title></title>
-    <script src="cordova-2.2.0rc2.js"></script>
+    <script src="cordova-2.2.0.js"></script>
  </head>
  <body>

--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -93,6 +93,8 @@ public class CordovaWebView extends WebView {
    private boolean bound;

    private boolean handleButton = false;
+    
+    private long lastMenuEventTime = 0;

 	NativeToJsMessageQueue jsMessageQueue;
 	ExposedJsApi exposedJsApi;
@@ -837,7 +839,10 @@ public class CordovaWebView extends WebView {
        }
        // Legacy
        else if (keyCode == KeyEvent.KEYCODE_MENU) {
-            this.loadUrl("javascript:cordova.fireDocumentEvent('menubutton');");
+            if (this.lastMenuEventTime < event.getEventTime()) {
+                this.loadUrl("javascript:cordova.fireDocumentEvent('menubutton');");
+            }
+            this.lastMenuEventTime = event.getEventTime();
            return super.onKeyUp(keyCode, event);
        }
        // If search key
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
 public class Device extends CordovaPlugin {
    public static final String TAG = "Device";

-    public static String cordovaVersion = "2.2.0rc2";              // Cordova version
+    public static String cordovaVersion = "2.2.0";              // Cordova version
    public static String platform = "Android";                  // Device OS
    public static String uuid;                                  // Device UUID

--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -918,7 +918,7 @@ public class DroidGap extends Activity implements CordovaInterface {
    @Override
    public boolean onPrepareOptionsMenu(Menu menu) {
        this.postMessage("onPrepareOptionsMenu", menu);
-        return false;
+        return true;
    }

    @Override
@@ -1015,10 +1015,10 @@ public class DroidGap extends Activity implements CordovaInterface {
    public boolean onKeyUp(int keyCode, KeyEvent event)
    {
    	//Determine if the focus is on the current view or not
-    	if (appView.getHitTestResult() != null && 
-    	    appView.getHitTestResult().getType() == WebView.HitTestResult.EDIT_TEXT_TYPE &&
-    	    keyCode == KeyEvent.KEYCODE_BACK) {
-    	    		return appView.onKeyUp(keyCode, event);
+        if (appView.getHitTestResult() != null && 
+                appView.getHitTestResult().getType() == WebView.HitTestResult.EDIT_TEXT_TYPE &&
+                (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU)) {
+                        return appView.onKeyUp(keyCode, event);
        } else if (appView.isCustomViewShowing() && keyCode == KeyEvent.KEYCODE_BACK) {
            return appView.onKeyUp(keyCode, event);
        } else {
Author	SHA1	Message	Date
Simon MacDonald	d9db845b43	CB-1795: onCreateOptionsMenu in PhoneGap 2.2.0 Release Candidate 2 isn't working anymore	2012-11-01 10:30:34 -04:00
Joe Bowser	e55327b064	Tagging the 2.2.0 release after this commit	2012-10-31 10:57:57 -07:00
Simon MacDonald	bdd5a4e053	Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android Somedays, I hate git.	2012-10-29 16:23:36 -04:00
Andrew Grieve	ac2e2c9a42	Update JS to new tag (again). Includes latest fix to CB-1745.	2012-10-29 16:21:12 -04:00
Andrew Grieve	76f9d49e24	Disable limiting of payload size when sending data to JS. Fixes https://issues.apache.org/jira/browse/CB-1745	2012-10-29 16:21:12 -04:00
Andrew Grieve	6ec8ab95fc	Update JS to new 2.2.0rc2 tag.	2012-10-29 16:21:12 -04:00
Joe Bowser	9c98625610	Partial fix for CB-1742, still don't know what this should do for notification.confirm's cancel, so we return zero for now	2012-10-29 16:21:12 -04:00
Joe Bowser	f270cde47d	Changing DroidGap back and duplicating code so that we don't have a regression on CB-1568	2012-10-29 16:21:12 -04:00
Joe Bowser	9de7efd072	Added fix for webViewClient. CB-1568	2012-10-29 16:21:12 -04:00
Joe Bowser	7b81d317a0	Moved the initialization of the IceCreamWebViewClient to CordovaWebView, we weren't loading the fix in properly after the refactor - CB-1742	2012-10-29 16:21:12 -04:00
Simon MacDonald	876f975aa2	CB-1691: Android menu button event doesn't fire when textbox has focus	2012-10-29 16:20:39 -04:00
@@ -1 +1 @@
 .2.0rc2
 .2.0