mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-26 20:33:07 +08:00
Remove onKey* from CordovaWebView interface (these exist on View already)
This commit is contained in:
parent
98246c0e35
commit
c052f40ef8
@ -974,36 +974,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
|
|||||||
this.runOnUiThread(runnable);
|
this.runOnUiThread(runnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onKeyUp(int keyCode, KeyEvent event)
|
|
||||||
{
|
|
||||||
if (appView != null && (appView.isCustomViewShowing() || appView.getFocusedChild() != null ) &&
|
|
||||||
(keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU)) {
|
|
||||||
return appView.onKeyUp(keyCode, event);
|
|
||||||
} else {
|
|
||||||
return super.onKeyUp(keyCode, event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Android 2.x needs to be able to check where the cursor is. Android 4.x does not
|
|
||||||
*
|
|
||||||
* (non-Javadoc)
|
|
||||||
* @see android.app.Activity#onKeyDown(int, android.view.KeyEvent)
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onKeyDown(int keyCode, KeyEvent event)
|
|
||||||
{
|
|
||||||
//Determine if the focus is on the current view or not
|
|
||||||
if (appView != null && appView.getFocusedChild() != null && (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU)) {
|
|
||||||
return appView.onKeyDown(keyCode, event);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return super.onKeyDown(keyCode, event);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when a message is sent to plugin.
|
* Called when a message is sent to plugin.
|
||||||
*
|
*
|
||||||
|
@ -108,10 +108,6 @@ public interface CordovaWebView {
|
|||||||
|
|
||||||
boolean isCustomViewShowing();
|
boolean isCustomViewShowing();
|
||||||
|
|
||||||
boolean onKeyUp(int keyCode, KeyEvent event);
|
|
||||||
|
|
||||||
boolean onKeyDown(int keyCode, KeyEvent event);
|
|
||||||
|
|
||||||
String exec(String service, String action, String callbackId, String message) throws JSONException;
|
String exec(String service, String action, String callbackId, String message) throws JSONException;
|
||||||
|
|
||||||
void setNativeToJsBridgeMode(int parseInt);
|
void setNativeToJsBridgeMode(int parseInt);
|
||||||
|
Loading…
Reference in New Issue
Block a user