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

Commit 2050de5b authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Text selection is broken. 

Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
parent ada1b6f2

core/java/android/widget/TextView.java

+6 −6
Original line number Diff line number Diff line
@@ -6822,11 +6822,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    public boolean onTouchEvent(MotionEvent event) {

        final int action = event.getActionMasked();



        if (mInsertionPointCursorController != null) {

            mInsertionPointCursorController.onTouchEvent(event);

        if (hasInsertionController()) {

            getInsertionController().onTouchEvent(event);

        }

        if (mSelectionModifierCursorController != null) {

            mSelectionModifierCursorController.onTouchEvent(event);

        if (hasSelectionController()) {

            getSelectionController().onTouchEvent(event);

        }



        if (action == MotionEvent.ACTION_DOWN) {
@@ -7324,9 +7324,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            minOffset = getSelectionStart();

            maxOffset = getSelectionEnd();

        } else {

            // selectionModifierCursorController is not null at that point

            // hasSelectionController is true since we canSelectText.

            SelectionModifierCursorController selectionModifierCursorController =

                ((SelectionModifierCursorController) mSelectionModifierCursorController);

                (SelectionModifierCursorController) getSelectionController();

            minOffset = selectionModifierCursorController.getMinTouchOffset();

            maxOffset = selectionModifierCursorController.getMaxTouchOffset();

        }