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

Weird merge error didn't account for isBackButtonBound

Browse Source
This commit is contained in:
Joe Bowser 2012-06-22 10:37:33 -07:00
parent bf0df9f3c3
commit dcb127c14d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ public class App extends Plugin {
* @return boolean
*/
public boolean isBackbuttonOverridden() {
return this.cordova.isBackButtonBound();
return webView.isBackButtonBound();
}
/**

5
framework/src/org/apache/cordova/CordovaWebView.java
View File

@ -771,4 +771,9 @@ public class CordovaWebView extends WebView {
keyUpCodes.add(keyCode);
}
}
public boolean isBackButtonBound()
{
return this.bound;
}
}