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

Merge "Fix typo in manual merge" into gingerbread-plus-aosp

Browse Source
This commit is contained in:
Adam Powell
2010-11-08 19:59:13 -08:00
committed by Android (Google) Code Review
parent f8c24a66a7 dd11387e58
commit 8bd41ac175
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6847,7 +6847,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return superResult; return superResult;
} }
if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() &&
mText instanceof Spannable && mLayout != null) { mText instanceof Spannable && mLayout != null) {
if (hasInsertionController()) { if (hasInsertionController()) {
getInsertionController().onTouchEvent(event); getInsertionController().onTouchEvent(event);