Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

Browse Source
This commit is contained in:
Hui Shu
2014-10-01 18:28:56 +00:00
committed by Android (Google) Code Review
parent 04e50c474c eb487c6301
commit aee5c9e7c1
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@@ -3102,7 +3102,6 @@ public final class Settings {
MOVED_TO_GLOBAL.add(Settings.Global.SET_GLOBAL_HTTP_PROXY); MOVED_TO_GLOBAL.add(Settings.Global.SET_GLOBAL_HTTP_PROXY);
MOVED_TO_GLOBAL.add(Settings.Global.DEFAULT_DNS_SERVER); MOVED_TO_GLOBAL.add(Settings.Global.DEFAULT_DNS_SERVER);
MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE); MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE);
MOVED_TO_GLOBAL.add(Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY);
} }
/** @hide */ /** @hide */
@@ -4584,13 +4583,6 @@ public final class Settings {
*/ */
public static final String ANR_SHOW_BACKGROUND = "anr_show_background"; 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 * The {@link ComponentName} string of the service to be used as the voice recognition
* service. * service.
@@ -5686,13 +5678,6 @@ public final class Settings {
*/ */
public static final String USE_GOOGLE_MAIL = "use_google_mail"; public static final String USE_GOOGLE_MAIL = "use_google_mail";
/**
* Webview Data reduction proxy key.
* @hide
*/
public static final String WEBVIEW_DATA_REDUCTION_PROXY_KEY =
"webview_data_reduction_proxy_key";
/** /**
* Whether Wifi display is enabled/disabled * Whether Wifi display is enabled/disabled
* 0=disabled. 1=enabled. * 0=disabled. 1=enabled.

9
core/java/android/webkit/WebView.java
View File

@@ -251,15 +251,6 @@ public class WebView extends AbsoluteLayout
implements ViewTreeObserver.OnGlobalFocusChangeListener, implements ViewTreeObserver.OnGlobalFocusChangeListener,
ViewGroup.OnHierarchyChangeListener, ViewDebug.HierarchyHandler { 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"; private static final String LOGTAG = "WebView";
// Throwing an exception for incorrect thread usage if the // Throwing an exception for incorrect thread usage if the