Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gilles Debunne
2011-02-04 15:46:15 -08:00
committed by Android (Google) Code Review
parent 8a6ba494a2 dc32a99889
commit 893ac28f75
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/TextView.java
View File

@@ -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();
}
/**