diff options
| author | 2012-04-02 10:27:21 -0700 | |
|---|---|---|
| committer | 2012-04-02 10:29:12 -0700 | |
| commit | 55cd3b85f305959a0540c085e91fb9db154d8be7 (patch) | |
| tree | 5f784046af26fe5c04b016a26ba0593ce9948e2d | |
| parent | 54e1553df69350130df5e4518abf14a9a64931bb (diff) | |
Don't show keyboard on focus change.
Bug 6270400
Webkit change: I1f06b7220e22665f5932928855c81eca6534bf2f
Change-Id: I2aa65b405b3a394b55821a4d688afeb22244c2c7
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 5a0818bc75b1..41a43228b33f 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1207,7 +1207,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc static final int FORM_DID_BLUR = 124; static final int UPDATE_MATCH_COUNT = 126; static final int CENTER_FIT_RECT = 127; - static final int REQUEST_KEYBOARD_WITH_SELECTION_MSG_ID = 128; static final int SET_SCROLLBAR_MODES = 129; static final int SELECTION_STRING_CHANGED = 130; static final int HIT_TEST_RESULT = 131; @@ -8267,9 +8266,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } } break; - case REQUEST_KEYBOARD_WITH_SELECTION_MSG_ID: - displaySoftKeyboard(true); - // fall through to UPDATE_TEXT_SELECTION_MSG_ID case UPDATE_TEXT_SELECTION_MSG_ID: updateTextSelectionFromMessage(msg.arg1, msg.arg2, (WebViewCore.TextSelectionData) msg.obj); diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 3eba6d7d09e7..bc68e0b52184 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -2830,7 +2830,7 @@ public final class WebViewCore { Message.obtain(mWebViewClassic.mPrivateHandler, WebViewClassic.INIT_EDIT_FIELD, initData).sendToTarget(); Message.obtain(mWebViewClassic.mPrivateHandler, - WebViewClassic.REQUEST_KEYBOARD_WITH_SELECTION_MSG_ID, + WebViewClassic.UPDATE_TEXT_SELECTION_MSG_ID, initData.mFieldPointer, 0, new TextSelectionData(start, end, selectionPtr)) .sendToTarget(); |