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

Commit f0176b59 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 4359 

* changes:
  Allow proper text editing after clicking with the trackball.
parents b0b160ae 1bd0d6a5

core/java/android/webkit/WebView.java

+9 −1
Original line number Diff line number Diff line
@@ -4582,6 +4582,9 @@ public class WebView extends AbsoluteLayout 
                    break;

                }

                case SWITCH_TO_CLICK:

                    // The user clicked with the trackball, and did not click a

                    // second time, so perform the action of a trackball single

                    // click

                    mTouchMode = TOUCH_DONE_MODE;

                    Rect visibleRect = sendOurVisibleRect();

                    // Note that sendOurVisibleRect calls viewToContent, so the
@@ -4593,9 +4596,14 @@ public class WebView extends AbsoluteLayout 
                    mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE,

                            cursorData());

                    playSoundEffect(SoundEffectConstants.CLICK);

                    if (!mCallbackProxy.uiOverrideUrlLoading(nativeCursorText())) {

                    boolean isTextInput = nativeCursorIsTextInput();

                    if (isTextInput || !mCallbackProxy.uiOverrideUrlLoading(

                                nativeCursorText())) {

                        mWebViewCore.sendMessage(EventHub.CLICK);

                    }

                    if (isTextInput) {

                        rebuildWebTextView();

                    }

                    break;

                case SCROLL_BY_MSG_ID:

                    setContentScrollBy(msg.arg1, msg.arg2, (Boolean) msg.obj);