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

Commit 100cc263 authored by Cary Clark's avatar Cary Clark Committed by Android Git Automerger
Browse files

am b5631f59: Merge "Do not merge : cancel text select mode when pressing back,... 

am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread

Merge commit 'b5631f59' into gingerbread-plus-aosp

* commit 'b5631f59':
  Do not merge : cancel text select mode when pressing back, etc.
parents 7e8a16e8 b5631f59

core/java/android/webkit/WebView.java

+12 −7
Original line number Diff line number Diff line
@@ -1284,13 +1284,18 @@ public class WebView extends AbsoluteLayout 
        return mDatabase.getHttpAuthUsernamePassword(host, realm);

    }



    private void clearHelpers() {

        clearTextEntry(false);

        selectionDone();

    }



    /**

     * Destroy the internal state of the WebView. This method should be called

     * after the WebView has been removed from the view system. No other

     * methods may be called on a WebView after destroy.

     */

    public void destroy() {

        clearTextEntry(false);

        clearHelpers();

        if (mWebViewCore != null) {

            // Set the handlers to null before destroying WebViewCore so no

            // more messages will be posted.
@@ -1608,7 +1613,7 @@ public class WebView extends AbsoluteLayout 
        arg.mUrl = url;

        arg.mExtraHeaders = extraHeaders;

        mWebViewCore.sendMessage(EventHub.LOAD_URL, arg);

        clearTextEntry(false);

        clearHelpers();

    }



    /**
@@ -1637,7 +1642,7 @@ public class WebView extends AbsoluteLayout 
            arg.mUrl = url;

            arg.mPostData = postData;

            mWebViewCore.sendMessage(EventHub.POST_URL, arg);

            clearTextEntry(false);

            clearHelpers();

        } else {

            loadUrl(url);

        }
@@ -1693,7 +1698,7 @@ public class WebView extends AbsoluteLayout 
        arg.mEncoding = encoding;

        arg.mHistoryUrl = historyUrl;

        mWebViewCore.sendMessage(EventHub.LOAD_DATA, arg);

        clearTextEntry(false);

        clearHelpers();

    }



    /**
@@ -1710,7 +1715,7 @@ public class WebView extends AbsoluteLayout 
     * Reload the current url.

     */

    public void reload() {

        clearTextEntry(false);

        clearHelpers();

        switchOutDrawHistory();

        mWebViewCore.sendMessage(EventHub.RELOAD);

    }
@@ -1790,7 +1795,7 @@ public class WebView extends AbsoluteLayout 


    private void goBackOrForward(int steps, boolean ignoreSnapshot) {

        if (steps != 0) {

            clearTextEntry(false);

            clearHelpers();

            mWebViewCore.sendMessage(EventHub.GO_BACK_FORWARD, steps,

                    ignoreSnapshot ? 1 : 0);

        }
@@ -4431,7 +4436,7 @@ public class WebView extends AbsoluteLayout 


    @Override

    protected void onDetachedFromWindow() {

        clearTextEntry(false);

        clearHelpers();

        dismissZoomControl();

        if (hasWindowFocus()) setActive(false);

        super.onDetachedFromWindow();