| Index: trunk/src/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
|
| ===================================================================
|
| --- trunk/src/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java (revision 221988)
|
| +++ trunk/src/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java (working copy)
|
| @@ -10,7 +10,6 @@
|
| import android.os.Message;
|
| import android.util.Log;
|
| import android.view.KeyEvent;
|
| -import android.view.View;
|
| import android.webkit.ConsoleMessage;
|
| import android.webkit.ValueCallback;
|
|
|
| @@ -38,14 +37,11 @@
|
|
|
| final AwContentsClient mContentsClient;
|
| final PreferredSizeChangedListener mPreferredSizeChangedListener;
|
| - final View mContainerView;
|
|
|
| public AwWebContentsDelegateAdapter(AwContentsClient contentsClient,
|
| - PreferredSizeChangedListener preferredSizeChangedListener,
|
| - View containerView) {
|
| + PreferredSizeChangedListener preferredSizeChangedListener) {
|
| mContentsClient = contentsClient;
|
| mPreferredSizeChangedListener = preferredSizeChangedListener;
|
| - mContainerView = containerView;
|
| }
|
|
|
| @Override
|
| @@ -55,46 +51,10 @@
|
|
|
| @Override
|
| public void handleKeyboardEvent(KeyEvent event) {
|
| - if (event.getAction() == KeyEvent.ACTION_DOWN) {
|
| - int direction;
|
| - switch (event.getKeyCode()) {
|
| - case KeyEvent.KEYCODE_DPAD_DOWN:
|
| - direction = View.FOCUS_DOWN;
|
| - break;
|
| - case KeyEvent.KEYCODE_DPAD_UP:
|
| - direction = View.FOCUS_UP;
|
| - break;
|
| - case KeyEvent.KEYCODE_DPAD_LEFT:
|
| - direction = View.FOCUS_LEFT;
|
| - break;
|
| - case KeyEvent.KEYCODE_DPAD_RIGHT:
|
| - direction = View.FOCUS_RIGHT;
|
| - break;
|
| - default:
|
| - direction = 0;
|
| - break;
|
| - }
|
| - if (direction != 0 && tryToMoveFocus(direction)) return;
|
| - }
|
| mContentsClient.onUnhandledKeyEvent(event);
|
| }
|
|
|
| @Override
|
| - public boolean takeFocus(boolean reverse) {
|
| - int direction =
|
| - (reverse == (mContainerView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL)) ?
|
| - View.FOCUS_RIGHT : View.FOCUS_LEFT;
|
| - if (tryToMoveFocus(direction)) return true;
|
| - direction = reverse ? View.FOCUS_UP : View.FOCUS_DOWN;
|
| - return tryToMoveFocus(direction);
|
| - }
|
| -
|
| - private boolean tryToMoveFocus(int direction) {
|
| - View focus = mContainerView.focusSearch(direction);
|
| - return focus != null && focus != mContainerView && focus.requestFocus();
|
| - }
|
| -
|
| - @Override
|
| public boolean addMessageToConsole(int level, String message, int lineNumber,
|
| String sourceId) {
|
| ConsoleMessage.MessageLevel messageLevel = ConsoleMessage.MessageLevel.DEBUG;
|
|
|