diff options
| author | Hui Shu <hush@google.com> | 2014-10-02 12:52:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 12:52:32 +0000 |
| commit | 9db0d62d96243447960e0d9732e8033ba183b5ce (patch) | |
| tree | ad0502d9418c19f39258a096e4087c2219a28b64 | |
| parent | 9bdb4ba3a815719342bfcd598da52fd12a86032b (diff) | |
| parent | 30c284fc460218652ffa89aed3da41225ad9b7cc (diff) | |
| download | frameworks_base-9db0d62d96243447960e0d9732e8033ba183b5ce.zip frameworks_base-9db0d62d96243447960e0d9732e8033ba183b5ce.tar.gz frameworks_base-9db0d62d96243447960e0d9732e8033ba183b5ce.tar.bz2 | |
am 30c284fc: am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '30c284fc460218652ffa89aed3da41225ad9b7cc':
Remove WebView DRP Setting from Developer Settings
| -rw-r--r-- | core/java/android/provider/Settings.java | 15 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 9 |
2 files changed, 0 insertions, 24 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f628017..a067070 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3102,7 +3102,6 @@ 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 */ @@ -4585,13 +4584,6 @@ 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. * @@ -5686,13 +5678,6 @@ 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. diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 68f5dad..172a7d9 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -251,15 +251,6 @@ 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 |