mirror of
https://github.com/apache/cordova-android.git
synced 2025-03-16 16:51:02 +08:00
Merge branch 'master' into 4.0.x (setButtonPlumbedToJs)
Conflicts: framework/src/org/apache/cordova/CordovaWebView.java
This commit is contained in:
commit
a40424e75c
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user