PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not enable bandwidth reduction settings if key is not available"

Browse Source
This commit is contained in:
Selim Gurun
2014-06-17 00:25:01 +00:00
committed by Android (Google) Code Review
parent d4720d9872 48afff27a2
commit 190b6ca8f4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/DevelopmentSettings.java
View File

@@ -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