github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fil Maj 2012-06-22 10:07:07 -07:00
parent 576f8cba44
commit fba87de064
2 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framework/src/org/apache/cordova/App.java
View File

@ -73,10 +73,6 @@ public class App extends Plugin {
else if (action.equals("overrideBackbutton")) { else if (action.equals("overrideBackbutton")) {
this.overrideBackbutton(args.getBoolean(0)); this.overrideBackbutton(args.getBoolean(0));
} }
else if (action.equals("isBackbuttonOverridden")) {
boolean b = this.isBackbuttonOverridden();
return new PluginResult(status, b);
}
else if (action.equals("exitApp")) { else if (action.equals("exitApp")) {
this.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!"); LOG.i("DroidGap", "WARNING: Volume Button Default Behaviour will be overridden. The volume event will be fired!");
webView.bindButton(button, override); 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. * Exit the Android application.

33
framework/src/org/apache/cordova/DroidGap.java
View File

@ -138,7 +138,6 @@ public class DroidGap extends Activity implements CordovaInterface {
protected CordovaWebViewClient webViewClient; protected CordovaWebViewClient webViewClient;
protected LinearLayout root; protected LinearLayout root;
public boolean bound = false;
protected boolean cancelLoadUrl = false; protected boolean cancelLoadUrl = false;
protected ProgressDialog spinnerDialog = null; protected ProgressDialog spinnerDialog = null;
@ -181,10 +180,6 @@ public class DroidGap extends Activity implements CordovaInterface {
// when another application (activity) is started. // when another application (activity) is started.
protected boolean keepRunning = true; protected boolean keepRunning = true;
private boolean volumeupBound;
private boolean volumedownBound;
/** /**
* Sets the authentication token. * Sets the authentication token.
* *
@ -948,24 +943,6 @@ public class DroidGap extends Activity implements CordovaInterface {
return this.getContext(); 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. * 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; protected Dialog splashDialog;
/** /**