github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-16 08:21:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (setButtonPlumbedToJs)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
This commit is contained in:
Andrew Grieve 2014-07-18 13:49:04 -04:00
commit a40424e75c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/org/apache/cordova/AndroidWebView.java
View File

@ -539,13 +539,17 @@ public class AndroidWebView extends WebView implements CordovaWebView {
} }
@Override @Override
public void setButtonPlumbedToJs(int keyCode, boolean value) { public void setButtonPlumbedToJs(int keyCode, boolean override) {
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_DOWN: case KeyEvent.KEYCODE_VOLUME_DOWN:
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_BACK: case KeyEvent.KEYCODE_BACK:
// TODO: Why are search and menu buttons handled separately? // TODO: Why are search and menu buttons handled separately?
boundKeyCodes.add(keyCode); if (override) {
boundKeyCodes.add(keyCode);
} else {
boundKeyCodes.remove(keyCode);
}
return; return;
default: default:
throw new IllegalArgumentException("Unsupported keycode: " + keyCode); throw new IllegalArgumentException("Unsupported keycode: " + keyCode);