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

Commit 2703a42d authored by Gilles Debunne's avatar Gilles Debunne
Browse files

When an EditText gains focus by tapping, move the insertion point where tapped. 

The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
parent b6d71351

core/java/android/text/method/ArrowKeyMovementMethod.java

+2 −18
Original line number Diff line number Diff line
@@ -319,25 +319,9 @@ public class ArrowKeyMovementMethod implements MovementMethod { 


    public void onTakeFocus(TextView view, Spannable text, int dir) {

        if ((dir & (View.FOCUS_FORWARD | View.FOCUS_DOWN)) != 0) {

            Layout layout = view.getLayout();



            if (layout == null) {

                /*

                 * This shouldn't be null, but do something sensible if it is.

                 */

            if (view.getLayout() == null) {

                // This shouldn't be null, but do something sensible if it is.

                Selection.setSelection(text, text.length());

            } else {

                /*

                 * Put the cursor at the end of the first line, which is

                 * either the last offset if there is only one line, or the

                 * offset before the first character of the second line

                 * if there is more than one line.

                 */

                if (layout.getLineCount() == 1) {

                    Selection.setSelection(text, text.length());

                } else {

                    Selection.setSelection(text, layout.getLineStart(1) - 1);

                }

            }

        } else {

            Selection.setSelection(text, text.length());

core/java/android/widget/TextView.java

+8 −2
Original line number Diff line number Diff line
@@ -6469,6 +6469,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            if (!mFrozenWithFocus || (selStart < 0 || selEnd < 0)) {

                boolean selMoved = mSelectionMoved;



                final int touchOffset = 

                    ((SelectionModifierCursorController) mSelectionModifierCursorController).

                    getMinTouchOffset();

                Selection.setSelection((Spannable) mText, touchOffset);



                if (mMovement != null) {

                    mMovement.onTakeFocus(this, (Spannable) mText, direction);

                }
@@ -6686,7 +6691,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    final int newSelEnd = getSelectionEnd();

                    

                    CommitSelectionReceiver csr = null;

                    if (newSelStart != oldSelStart || newSelEnd != oldSelEnd) {

                    if (newSelStart != oldSelStart || newSelEnd != oldSelEnd ||

                            didTouchFocusSelect()) {

                        csr = new CommitSelectionReceiver(oldSelStart, oldSelEnd,

                                newSelStart, newSelEnd);

                    }