am 00c50b2e: am f348502c: Merge "Allow TextView to do its thing." into gingerbread

Merge commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065'

* commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065':
  Allow TextView to do its thing.

1 files changed, 1 insertions, 3 deletions

diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 1aff17031b4a..812e1261479b 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -583,6 +583,7 @@ import java.util.ArrayList;
             return false;
         case MotionEvent.ACTION_UP:
         case MotionEvent.ACTION_CANCEL:
+            super.onTouchEvent(event);
             if (mHasPerformedLongClick) {
                 mGotTouchDown = false;
                 return false;
@@ -780,9 +781,6 @@ import java.util.ArrayList;
         // webkit's drawing.
         setWillNotDraw(!inPassword);
         setBackgroundDrawable(inPassword ? mBackground : null);
-        // For non-password fields, avoid the invals from TextView's blinking
-        // cursor
-        setCursorVisible(inPassword);
     }
 
     /**