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

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

Browse Source 
Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp

* commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
  Allow TextView to do its thing.
This commit is contained in:
Leon Scroggins
2010-10-12 11:23:12 -07:00
committed by Android Git Automerger
parent 4711d21a55 f348502c70
commit 00c50b2e49
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebTextView.java
View File

@@ -519,6 +519,7 @@ import java.util.ArrayList;
return false; return false;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
super.onTouchEvent(event);
if (mHasPerformedLongClick) { if (mHasPerformedLongClick) {
mGotTouchDown = false; mGotTouchDown = false;
return false; return false;
@@ -684,9 +685,6 @@ import java.util.ArrayList;
// webkit's drawing. // webkit's drawing.
setWillNotDraw(!inPassword); setWillNotDraw(!inPassword);
setBackgroundDrawable(inPassword ? mBackground : null); setBackgroundDrawable(inPassword ? mBackground : null);
// For non-password fields, avoid the invals from TextView's blinking
// cursor
setCursorVisible(inPassword);
} }
/** /**