Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76f6f5c authored by Leon Scroggins's avatar Leon Scroggins Committed by Android Git Automerger
Browse files

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

Merge commit '00c50b2e'

* commit '00c50b2e':
  Allow TextView to do its thing.
parents 2340b842 00c50b2e

core/java/android/webkit/WebTextView.java

+1 −3
Original line number Diff line number Diff line
@@ -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);

    }



    /**