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

Commit 893ac28f authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread

parents 8a6ba494 dc32a998

core/java/android/widget/TextView.java

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



    private void makeBlink() {

        if (!mCursorVisible) {

        if (!mCursorVisible || !isTextEditable()) {

            if (mBlink != null) {

                mBlink.removeCallbacks(mBlink);

            }
@@ -6932,7 +6932,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * @return True iff this TextView contains a text that can be edited.

     */

    private boolean isTextEditable() {

        return mText instanceof Editable && onCheckIsTextEditor();

        return mText instanceof Editable && onCheckIsTextEditor() && isEnabled();

    }



    /**