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

Commit 1ba2a47b authored by Gilles Debunne's avatar Gilles Debunne Committed by Android Git Automerger
Browse files

am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO... 

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

* commit '893ac28f':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
parents 826fbdf7 893ac28f

core/java/android/widget/TextView.java

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



    private void makeBlink() {

        if (!mCursorVisible) {

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

            if (mBlink != null) {

                mBlink.removeCallbacks(mBlink);

            }
@@ -6954,7 +6954,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();

    }



    /**