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

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

Browse Source 
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
This commit is contained in:
Gilles Debunne
2011-02-04 15:50:15 -08:00
committed by Android Git Automerger
parent 826fbdf7b6 893ac28f75
commit 1ba2a47b82
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

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