From fba87de064446a613c0a7475e0088c51514498a4 Mon Sep 17 00:00:00 2001 From: Fil Maj Date: Fri, 22 Jun 2012 10:07:07 -0700 Subject: [PATCH] Removed some legacy button code that existed in droidgap + app plugins --- framework/src/org/apache/cordova/App.java | 12 ------- .../src/org/apache/cordova/DroidGap.java | 33 ------------------- 2 files changed, 45 deletions(-) diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java index 8d0895b0..4830c581 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. diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java index 8b26f375..723be5c0 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. * @@ -948,24 +943,6 @@ public class DroidGap extends Activity implements CordovaInterface { return this.getContext(); } - /** - * 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. * @@ -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; /**