summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 7c09a905d919..a5e144a82969 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -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();
}
/**