Blinking runnable is created only if text is editable. DO NOT MERGE.

Gilles Debunne · Gilles Debunne · commit dc32a9988904 · 2011-01-11T10:24:11.000-08:00
Change-Id: If85acc73cfa12b6da23d60459a746e1aef51d3aa
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -6523,7 +6523,7 @@ public void onSpanRemoved(Spannable buf, Object what, int s, int e) {
     }
 
     private void makeBlink() {
-        if (!mCursorVisible) {
+        if (!mCursorVisible || !isTextEditable()) {
             if (mBlink != null) {
                 mBlink.removeCallbacks(mBlink);
             }
@@ -6912,7 +6912,7 @@ private void prepareCursorControllers() {
      * @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();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -6523,7 +6523,7 @@ public void onSpanRemoved(Spannable buf, Object what, int s, int e) {`
`6523`	`6523`	`}`
`6524`	`6524`
`6525`	`6525`	`private void makeBlink() {`
`6526`		`- if (!mCursorVisible) {`
	`6526`	`+ if (!mCursorVisible \|\| !isTextEditable()) {`
`6527`	`6527`	`if (mBlink != null) {`
`6528`	`6528`	`mBlink.removeCallbacks(mBlink);`
`6529`	`6529`	`}`
`@@ -6912,7 +6912,7 @@ private void prepareCursorControllers() {`
`6912`	`6912`	`* @return True iff this TextView contains a text that can be edited.`
`6913`	`6913`	`*/`
`6914`	`6914`	`private boolean isTextEditable() {`
`6915`		`- return mText instanceof Editable && onCheckIsTextEditor();`
	`6915`	`+ return mText instanceof Editable && onCheckIsTextEditor() && isEnabled();`
`6916`	`6916`	`}`
`6917`	`6917`
`6918`	`6918`	`/**`