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

Gilles Debunne · Android (Google) Code Review · commit 893ac28f7556 · 2011-02-04T15:46:15.000-08:00
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -6541,7 +6541,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);
             }
@@ -6932,7 +6932,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
`@@ -6541,7 +6541,7 @@ public void onSpanRemoved(Spannable buf, Object what, int s, int e) {`
`6541`	`6541`	`}`
`6542`	`6542`
`6543`	`6543`	`private void makeBlink() {`
`6544`		`- if (!mCursorVisible) {`
	`6544`	`+ if (!mCursorVisible \|\| !isTextEditable()) {`
`6545`	`6545`	`if (mBlink != null) {`
`6546`	`6546`	`mBlink.removeCallbacks(mBlink);`
`6547`	`6547`	`}`
`@@ -6932,7 +6932,7 @@ private void prepareCursorControllers() {`
`6932`	`6932`	`* @return True iff this TextView contains a text that can be edited.`
`6933`	`6933`	`*/`
`6934`	`6934`	`private boolean isTextEditable() {`
`6935`		`- return mText instanceof Editable && onCheckIsTextEditor();`
	`6935`	`+ return mText instanceof Editable && onCheckIsTextEditor() && isEnabled();`
`6936`	`6936`	`}`
`6937`	`6937`
`6938`	`6938`	`/**`