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

Commit 46c1da5d authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 04f2f31a: am 307a2b59: Merge "Remove long_press when WebView lost window... 

am 04f2f31a: am 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo
parents f623e9bd 04f2f31a

core/java/android/webkit/WebView.java

+3 −1
Original line number Diff line number Diff line
@@ -4012,8 +4012,8 @@ public class WebView extends AbsoluteLayout 
    @Override

    protected void onDetachedFromWindow() {

        clearTextEntry(false);

        super.onDetachedFromWindow();

        dismissZoomControl();

        super.onDetachedFromWindow();

    }



    /**
@@ -4076,6 +4076,8 @@ public class WebView extends AbsoluteLayout 
            }

            mGotKeyDown = false;

            mShiftIsPressed = false;

            mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);

            mTouchMode = TOUCH_DONE_MODE;

            if (mNativeClass != 0) {

                nativeRecordButtons(false, false, true);

            }