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

Commit c3d8b0f2 authored by Selim Gurun's avatar Selim Gurun Committed by Android (Google) Code Review
Browse files

Merge "Add frameworks/base changes for enabling reduction proxy"

parents 0b8745c0 a83f1e3d

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -4394,6 +4394,13 @@ public final class Settings { 
         */

        public static final String ANR_SHOW_BACKGROUND = "anr_show_background";



        /**

         * (Experimental). If nonzero, WebView uses data reduction proxy to save network

         * bandwidth. Otherwise, WebView does not use data reduction proxy.

         * @hide

         */

        public static final String WEBVIEW_DATA_REDUCTION_PROXY = "webview_data_reduction_proxy";



        /**

         * The {@link ComponentName} string of the service to be used as the voice recognition

         * service.

core/java/android/webkit/WebView.java

+9 −0
Original line number Diff line number Diff line
@@ -251,6 +251,15 @@ public class WebView extends AbsoluteLayout 
        implements ViewTreeObserver.OnGlobalFocusChangeListener,

        ViewGroup.OnHierarchyChangeListener, ViewDebug.HierarchyHandler {



    /**

     * Broadcast Action: Indicates the data reduction proxy setting changed.

     * Sent by the settings app when user changes the data reduction proxy value. This intent will

     * always stay as a hidden API.

     * @hide

     */

    public static final String DATA_REDUCTION_PROXY_SETTING_CHANGED =

            "android.webkit.DATA_REDUCTION_PROXY_SETTING_CHANGED";



    private static final String LOGTAG = "WebView";



    // Throwing an exception for incorrect thread usage if the