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

Commit d119e520 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Android Git Automerger
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
parents 9509bfe4 7bfcad34

core/java/android/widget/Editor.java

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ public class Editor { 
        }

    }



    private void hideInsertionPointCursorController() {

    void hideInsertionPointCursorController() {

        if (mInsertionPointCursorController != null) {

            mInsertionPointCursorController.hide();

        }

core/java/android/widget/TextView.java

+6 −0
Original line number Diff line number Diff line
@@ -9067,6 +9067,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }



    boolean selectAllText() {

        // Need to hide insert point cursor controller before settings selection, otherwise insert

        // point cursor controller obtains cursor update event and update cursor with cancelling

        // selection.

        if (mEditor != null) {

            mEditor.hideInsertionPointCursorController();

        }

        final int length = mText.length();

        Selection.setSelection((Spannable) mText, 0, length);

        return length > 0;