am 8693f82d: Merge change If1f0bf33 into eclair

Merge commit '8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-plus-aosp

* commit '8693f82d02fd9b3a805e076fa1eafacd1737446d':
  Some work on issue #2286804: sometimes text field doesn't accept input

1 files changed, 1 insertions, 4 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index f55ca3fecfd9..201cc0c84056 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6529,6 +6529,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             // Reset this state; it will be re-set if super.onTouchEvent
             // causes focus to move to the view.
             mTouchFocusSelected = false;
+            mScrolled = false;
         }
         
         final boolean superResult = super.onTouchEvent(event);
@@ -6545,10 +6546,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
         if ((mMovement != null || onCheckIsTextEditor()) && mText instanceof Spannable && mLayout != null) {
             
-            if (action == MotionEvent.ACTION_DOWN) {
-                mScrolled = false;
-            }
-            
             boolean handled = false;
             
             int oldSelStart = Selection.getSelectionStart(mText);