You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/06/22 19:39:14 UTC
[1/2] android commit: Might as well keep isBackbuttonOverriden on the
plugin
Updated Branches:
refs/heads/master fba87de06 -> 5d211f2fa
Might as well keep isBackbuttonOverriden on the plugin
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/5d211f2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5d211f2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5d211f2f
Branch: refs/heads/master
Commit: 5d211f2fa6071f00ba586edf95b2a2554ad91fc8
Parents: dcb127c fba87de
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Jun 22 10:38:42 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Jun 22 10:38:42 2012 -0700
----------------------------------------------------------------------
bin/create.js | 40 ++++--
.../cordova/ApplicationInfo/ApplicationInfo.class | Bin 1941 -> 2045 bytes
.../cordova/ApplicationInfo/ApplicationInfo.java | 2 +-
bin/templates/cordova/ApplicationInfo/manifest.txt | 1 -
bin/templates/cordova/BOOM.bat | 1 +
bin/templates/cordova/appinfo.jar | Bin 1527 -> 1587 bytes
bin/templates/cordova/clean.bat | 1 +
bin/templates/cordova/cordova.bat | 15 ++
bin/templates/cordova/cordova.js | 108 +++++++++++++++
bin/templates/cordova/debug.bat | 1 +
bin/templates/cordova/emulate.bat | 1 +
bin/tests/test_create_win.js | 39 +++++-
framework/src/org/apache/cordova/App.java | 5 +-
framework/src/org/apache/cordova/DroidGap.java | 33 -----
14 files changed, 194 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5d211f2f/framework/src/org/apache/cordova/App.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/App.java
index a9faebb,4830c58..1481624
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@@ -202,16 -198,8 +198,17 @@@ 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 webView.isBackButtonBound();
+ }
+
+ /**
* Exit the Android application.
*/
public void exitApp() {