incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject android commit: Removed some legacy button code that existed in droidgap + app plugins
Date Fri, 22 Jun 2012 17:35:02 GMT
Updated Branches:
  refs/heads/master 576f8cba4 -> fba87de06


Removed some legacy button code that existed in droidgap + app plugins


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/fba87de0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/fba87de0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/fba87de0

Branch: refs/heads/master
Commit: fba87de064446a613c0a7475e0088c51514498a4
Parents: 576f8cb
Author: Fil Maj <maj.fil@gmail.com>
Authored: Fri Jun 22 10:07:07 2012 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Fri Jun 22 10:07:07 2012 -0700

----------------------------------------------------------------------
 framework/src/org/apache/cordova/App.java      |   12 -------
 framework/src/org/apache/cordova/DroidGap.java |   33 -------------------
 2 files changed, 0 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/fba87de0/framework/src/org/apache/cordova/App.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index 8d0895b..4830c58 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -73,10 +73,6 @@ public class App extends Plugin {
             else if (action.equals("overrideBackbutton")) {
                 this.overrideBackbutton(args.getBoolean(0));
             }
-            else if (action.equals("isBackbuttonOverridden")) {
-                boolean b = this.isBackbuttonOverridden();
-                return new PluginResult(status, b);
-            }
             else if (action.equals("exitApp")) {
                 this.exitApp();
             }
@@ -202,14 +198,6 @@ public class App extends Plugin {
         LOG.i("DroidGap", "WARNING: Volume Button Default Behaviour will be overridden. 
The volume event will be fired!");
         webView.bindButton(button, override);
     }
-    /**
-     * Return whether the Android back button is overridden by the user.
-     *
-     * @return boolean
-     */
-    public boolean isBackbuttonOverridden() {
-        return this.cordova.isBackButtonBound();
-    }
 
     /**
      * Exit the Android application.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/fba87de0/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 8b26f37..723be5c 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -138,7 +138,6 @@ public class DroidGap extends Activity implements CordovaInterface {
     protected CordovaWebViewClient webViewClient;
 
     protected LinearLayout root;
-    public boolean bound = false;
     protected boolean cancelLoadUrl = false;
     protected ProgressDialog spinnerDialog = null;
 
@@ -181,10 +180,6 @@ public class DroidGap extends Activity implements CordovaInterface {
     // when another application (activity) is started.
     protected boolean keepRunning = true;
 
-    private boolean volumeupBound;
-
-    private boolean volumedownBound;
-
     /**
     * Sets the authentication token.
     *
@@ -949,24 +944,6 @@ public class DroidGap extends Activity implements CordovaInterface {
     }
 
     /**
-     * Override the backbutton.
-     *
-     * @param override
-     */
-    public void bindBackButton(boolean override) {
-        this.bound = override;
-    }
-
-    /**
-     * Determine of backbutton is overridden.
-     *
-     * @return
-     */
-    public boolean isBackButtonBound() {
-        return this.bound;
-    }
-
-    /**
      * Load the specified URL in the Cordova webview or a new browser instance.
      *
      * NOTE: If openExternal is false, only URLs listed in whitelist can be loaded.
@@ -982,16 +959,6 @@ public class DroidGap extends Activity implements CordovaInterface {
         }
     }
 
-    public void bindButton(String button, boolean override) {
-      // TODO Auto-generated method stub
-      if (button.compareTo("volumeup")==0) {
-        this.volumeupBound = override;
-      }
-      else if (button.compareTo("volumedown")==0) {
-        this.volumedownBound = override;
-      }
-    }
-
     protected Dialog splashDialog;
 
     /**


Mime
View raw message