diff options
| author | Gilles Debunne <debunne@google.com> | 2011-02-04 15:46:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-04 15:46:15 -0800 |
| commit | 893ac28f75561061a8f334cbd4e47833d7fd7843 (patch) | |
| tree | 995423588281f5745ae2c0e474d01c6e2c885d39 /core/java/android/widget/TextView.java | |
| parent | 8a6ba494a28702e68b0a8fbd8bac34335536a8f8 (diff) | |
| parent | dc32a99889045824482f69a3d175d6d5305e392c (diff) | |
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 5a1393e0f7dc..ae5860ad2395 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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(); } /** |