Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7a1d5f8 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

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

parents 20c19f47 55cd3b85

core/java/android/webkit/WebViewClassic.java

+0 −4
Original line number Diff line number Diff line
@@ -1206,7 +1206,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
    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 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);

core/java/android/webkit/WebViewCore.java

+1 −1
Original line number Diff line number Diff line
@@ -2819,7 +2819,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();