Merge "Add a setting for data reduction proxy key"

This commit is contained in:
Selim Gurun
2014-05-16 19:09:10 +00:00
committed by Android (Google) Code Review

View File

@@ -2900,6 +2900,7 @@ public final class Settings {
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.PREFERRED_NETWORK_MODE);
MOVED_TO_GLOBAL.add(Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY);
}
/** @hide */
@@ -5330,6 +5331,13 @@ public final class Settings {
*/
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
* 0=disabled. 1=enabled.