incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject android commit: CB-1289: The menubutton event fires twice
Date Tue, 28 Aug 2012 15:55:31 GMT
Updated Branches:
  refs/heads/master 07439ff99 -> e07822350


CB-1289: The menubutton event fires twice


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

Branch: refs/heads/master
Commit: e07822350ee71f578c15fddfb490f2ebf21b025c
Parents: 07439ff
Author: macdonst <simon.macdonald@gmail.com>
Authored: Tue Aug 28 11:55:12 2012 -0400
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Tue Aug 28 11:55:12 2012 -0400

----------------------------------------------------------------------
 framework/src/org/apache/cordova/DroidGap.java |   20 +-----------------
 1 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e0782235/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 03ca2ad..935f0b1 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -602,7 +602,7 @@ public class DroidGap extends Activity implements CordovaInterface {
         super.onPause();
 
         LOG.d(TAG, "Paused the application!");
-        
+
         // Don't process pause if shutting down, since onDestroy() will be called
         if (this.activityState == ACTIVITY_EXITING) {
             return;
@@ -811,7 +811,7 @@ public class DroidGap extends Activity implements CordovaInterface {
      */
     public void onReceivedError(final int errorCode, final String description, final String
failingUrl) {
         final DroidGap me = this;
-        
+
         // If errorUrl specified, then load it
         final String errorUrl = me.getStringProperty("errorUrl", null);
         if ((errorUrl != null) && (errorUrl.startsWith("file://") || errorUrl.indexOf(me.baseUrl)
== 0 || this.appView.isUrlWhiteListed(errorUrl)) && (!failingUrl.equals(errorUrl)))
{
@@ -1032,20 +1032,4 @@ public class DroidGap extends Activity implements CordovaInterface
{
         }
         return null;
     }
-    
-
-    /*
-     * (non-Javadoc)
-     * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent)
-     */
-    
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event)
-    {
-        if (appView.canGoBack() || keyCode != KeyEvent.KEYCODE_BACK)
-            return appView.onKeyUp(keyCode, event);
-        else 
-            return super.onKeyUp(keyCode, event);
-    }
-  
 }


Mime
View raw message