diff options
| author | Selim Gurun <sgurun@google.com> | 2014-06-17 00:25:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-16 22:12:26 +0000 |
| commit | 190b6ca8f48c0807af2fd8f551046e8024e2619b (patch) | |
| tree | a0963c18c638588b011e5d6f59ffd395670b4757 /src | |
| parent | d4720d98723db76b8ce9e9e7385582f99d849ee6 (diff) | |
| parent | 48afff27a297943ff90c13a4f3bd34557ec1e735 (diff) | |
| download | packages_apps_Settings-190b6ca8f48c0807af2fd8f551046e8024e2619b.zip packages_apps_Settings-190b6ca8f48c0807af2fd8f551046e8024e2619b.tar.gz packages_apps_Settings-190b6ca8f48c0807af2fd8f551046e8024e2619b.tar.bz2 | |
Merge "Do not enable bandwidth reduction settings if key is not available"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 02045ab..87b1f32 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -358,6 +358,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mAllPrefs.add(mProcessStats); mWebViewDataReductionProxy = findAndInitCheckboxPref(WEBVIEW_DATA_REDUCTION_PROXY_KEY); + String key = Settings.Global.getString(getActivity().getContentResolver(), + Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY); + // Make it not selectable if the key is not available for some reason. + mWebViewDataReductionProxy.setSelectable(key != null && !key.isEmpty()); } private ListPreference addListPreference(String prefKey) { @@ -1250,8 +1254,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWebViewDataReductionProxyOptions() { updateCheckBox(mWebViewDataReductionProxy, Settings.Secure.getInt( - getActivity().getContentResolver(), - Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0); + getActivity().getContentResolver(), + Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0); } @Override |