diff options
| author | Hui Shu <hush@google.com> | 2014-10-01 22:15:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 22:15:20 +0000 |
| commit | 888fd710cd9ae569d47e1795f47e2ad909b5c8df (patch) | |
| tree | 3567668d55456a69727fcb6bc0ad9bc21f0af746 /core/java/android/provider | |
| parent | 489502cf606b12cc0f872cec6dfd18d0e41db93f (diff) | |
| parent | 4e0ad44fcac48b2be77bd116ffdb696cb6490829 (diff) | |
| download | frameworks_base-888fd710cd9ae569d47e1795f47e2ad909b5c8df.zip frameworks_base-888fd710cd9ae569d47e1795f47e2ad909b5c8df.tar.gz frameworks_base-888fd710cd9ae569d47e1795f47e2ad909b5c8df.tar.bz2 | |
am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
Revert "Remove WebView DRP Setting from Developer Settings"
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 18e6bf3..ec4a53e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3102,6 +3102,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 */ @@ -4584,6 +4585,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. * @@ -5678,6 +5686,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. |