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

Commit 004b02d6 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Touch moves cursor in text refactored 

Code was moved back from the movement method to the touch event code in TextView.

Change-Id: I7dc0d957554ddce08e810d20e0385f98802ef1a4
parent b3ca0fe6

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

+0 −2
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ public class ArrowKeyMovementMethod extends BaseMovementMethod implements Moveme 
                if (isSelecting(buffer)) {

                    buffer.removeSpan(LAST_TAP_DOWN);

                    Selection.extendSelection(buffer, offset);

                } else if (!widget.shouldIgnoreActionUpEvent()) {

                    Selection.setSelection(buffer, offset);

                }



                MetaKeyKeyListener.adjustMetaAfterKeypress(buffer);

core/java/android/widget/TextView.java

+7 −14
Original line number Diff line number Diff line
@@ -8353,7 +8353,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        }



        final boolean touchIsFinished = (action == MotionEvent.ACTION_UP) &&

                !shouldIgnoreActionUpEvent() && isFocused();

                !mIgnoreActionUpEvent && isFocused();



         if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()

                && mText instanceof Spannable && mLayout != null) {
@@ -8377,6 +8377,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            }



            if (touchIsFinished && (isTextEditable() || mTextIsSelectable)) {

                // Move cursor

                final int offset = getOffsetForPosition(event.getX(), event.getY());

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



                // Show the IME, except when selecting in read-only text.

                final InputMethodManager imm = InputMethodManager.peekInstance();

                viewClicked(imm);
@@ -8529,17 +8533,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        mIgnoreActionUpEvent = true;

    }



    /**

     * This method is only valid during a touch event.

     *

     * @return true when the ACTION_UP event should be ignored, false otherwise.

     *

     * @hide

     */

    public boolean shouldIgnoreActionUpEvent() {

        return mIgnoreActionUpEvent;

    }



    @Override

    public boolean onTrackballEvent(MotionEvent event) {

        if (mMovement != null && mText instanceof Spannable &&
@@ -10147,8 +10140,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        boolean willExtract = extractedTextModeWillBeStarted();



        // Do not start the action mode when extracted text will show up full screen, thus

        // immediately hiding the newly created action bar, which would be visually distracting.

        // Do not start the action mode when extracted text will show up full screen, which would

        // immediately hide the newly created action bar and would be visually distracting.

        if (!willExtract) {

            ActionMode.Callback actionModeCallback = new SelectionActionModeCallback();

            mSelectionActionMode = startActionMode(actionModeCallback);