Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
12c9f41c19
@@ -125,7 +125,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
|
|||||||
mWebAction.setTitle(R.string.web_action_enable_title);
|
mWebAction.setTitle(R.string.web_action_enable_title);
|
||||||
mWebAction.setSummary(R.string.web_action_enable_summary);
|
mWebAction.setSummary(R.string.web_action_enable_summary);
|
||||||
mWebAction.setChecked(Settings.Secure.getInt(getContentResolver(),
|
mWebAction.setChecked(Settings.Secure.getInt(getContentResolver(),
|
||||||
Settings.Secure.WEB_ACTION_ENABLED, 1) != 0);
|
Settings.Secure.INSTANT_APPS_ENABLED, 1) != 0);
|
||||||
mWebAction.setOnPreferenceChangeListener(this);
|
mWebAction.setOnPreferenceChangeListener(this);
|
||||||
webActionCategory.addPreference(mWebAction);
|
webActionCategory.addPreference(mWebAction);
|
||||||
|
|
||||||
@@ -164,8 +164,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
|
|||||||
boolean checked = (boolean) newValue;
|
boolean checked = (boolean) newValue;
|
||||||
Settings.Secure.putInt(
|
Settings.Secure.putInt(
|
||||||
getContentResolver(),
|
getContentResolver(),
|
||||||
Settings.Secure.WEB_ACTION_ENABLED, checked ? 1 : 0);
|
Settings.Secure.INSTANT_APPS_ENABLED, checked ? 1 : 0);
|
||||||
mWebAction.setChecked(checked);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user