Merge "Don't show keyboard on focus change."

Author: George Mount

core/java/android/webkit/WebViewClassic.java

@@ -1206,7 +1206,6 @@ public void onTrimMemory(int level) {
     static final int REPLACE_BASE_CONTENT               = 123;
     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;
@@ -8286,9 +8285,6 @@ public void handleMessage(Message msg) {
                         }
                     }
                     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);

core/java/android/webkit/WebViewCore.java

@@ -2819,7 +2819,7 @@ private void initEditField(int start, int end, int selectionPtr,
         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();