Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev

am: 12c9f41c19

Change-Id: Id70340013a4a446ff21178aaa143b120f390d71c
This commit is contained in:
Jesse Evans
2017-04-12 19:52:54 +00:00
committed by android-build-merger

View File

@@ -125,7 +125,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
mWebAction.setTitle(R.string.web_action_enable_title);
mWebAction.setSummary(R.string.web_action_enable_summary);
mWebAction.setChecked(Settings.Secure.getInt(getContentResolver(),
Settings.Secure.WEB_ACTION_ENABLED, 1) != 0);
Settings.Secure.INSTANT_APPS_ENABLED, 1) != 0);
mWebAction.setOnPreferenceChangeListener(this);
webActionCategory.addPreference(mWebAction);
@@ -164,8 +164,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
boolean checked = (boolean) newValue;
Settings.Secure.putInt(
getContentResolver(),
Settings.Secure.WEB_ACTION_ENABLED, checked ? 1 : 0);
mWebAction.setChecked(checked);
Settings.Secure.INSTANT_APPS_ENABLED, checked ? 1 : 0);
return true;
}
return false;