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

Commit 90102e2c authored by Jonathan Dixon's avatar Jonathan Dixon
Browse files

resolved conflicts for merge of 1421827b to master 

Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81
parents 887a192e 1421827b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30438,6 +30438,7 @@ package android.webkit { 
    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);

    method public void setWebViewClient(android.webkit.WebViewClient);

    method public deprecated boolean showFindDialog(java.lang.String, boolean);

    method public void stopLoading();

core/java/android/webkit/WebView.java

+16 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,22 @@ public class WebView extends AbsoluteLayout 
        return mProvider.getSettings();

    }



    /**

     * Enables debugging of web contents (HTML / CSS / JavaScript)

     * loaded into any WebViews of this application. This flag can be enabled

     * in order to facilitate debugging of web layouts and JavaScript

     * code running inside WebViews. Please refer to WebView documentation

     * for the debugging guide.

     *

     * The default is false.

     *

     * @param enabled whether to enable web contents debugging

     */

    public static void setWebContentsDebuggingEnabled(boolean enabled) {

        checkThread();

        getFactory().getStatics().setWebContentsDebuggingEnabled(enabled);

    }



    /**

     * Gets the list of currently loaded plugins.

     *

core/java/android/webkit/WebViewClassic.java

+5 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
            return WebSettingsClassic.getDefaultUserAgentForLocale(context,

                    Locale.getDefault());

        }



        @Override

        public void setWebContentsDebuggingEnabled(boolean enable) {

            // no-op for WebViewClassic.

        }

    }



    private void onHandleUiEvent(MotionEvent event, int eventType, int flags) {

core/java/android/webkit/WebViewFactoryProvider.java

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ public interface WebViewFactoryProvider { 
         * Used for tests only.

         */

         void freeMemoryForTests();



        /**

         * Implements the API method:

         * {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) }

         */

        void setWebContentsDebuggingEnabled(boolean enable);

    }



    Statics getStatics();