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

2010-11-08 19:59:13 -08:00
parent f8c24a66a7 dd11387e58
commit 8bd41ac175
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6847,7 +6847,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
            return superResult;
        }

-        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
+        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled() &&
                mText instanceof Spannable && mLayout != null) {
            if (hasInsertionController()) {
                getInsertionController().onTouchEvent(event);