Merge "Add default value for apply_ramping_ringer." (71c2da8a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -9066,6 +9066,8 @@ public final class Settings {
		*/
		public static final String APPLY_RAMPING_RINGER = "apply_ramping_ringer";

		private static final Validator APPLY_RAMPING_RINGER_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Setting whether the global gesture for enabling accessibility is enabled.
		* If this gesture is enabled the user will be able to perfrom it to enable
		@@ -13501,6 +13503,7 @@ public final class Settings {
		* @hide
		*/
		public static final String[] SETTINGS_TO_BACKUP = {
		APPLY_RAMPING_RINGER,
		BUGREPORT_IN_POWER_MENU,
		STAY_ON_WHILE_PLUGGED_IN,
		APP_AUTO_RESTRICTION_ENABLED,
		@@ -13541,6 +13544,7 @@ public final class Settings {
		*/
		public static final Map<String, Validator> VALIDATORS = new ArrayMap<>();
		static {
		VALIDATORS.put(APPLY_RAMPING_RINGER, APPLY_RAMPING_RINGER_VALIDATOR);
		VALIDATORS.put(BUGREPORT_IN_POWER_MENU, BUGREPORT_IN_POWER_MENU_VALIDATOR);
		VALIDATORS.put(STAY_ON_WHILE_PLUGGED_IN, STAY_ON_WHILE_PLUGGED_IN_VALIDATOR);
		VALIDATORS.put(AUTO_TIME, AUTO_TIME_VALIDATOR);

+0 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ public class SettingsBackupTest {
		Settings.Global.ANOMALY_CONFIG_VERSION,
		Settings.Global.APN_DB_UPDATE_CONTENT_URL,
		Settings.Global.APN_DB_UPDATE_METADATA_URL,
		Settings.Global.APPLY_RAMPING_RINGER,
		Settings.Global.APP_BINDING_CONSTANTS,
		Settings.Global.APP_IDLE_CONSTANTS,
		Settings.Global.APP_OPS_CONSTANTS,

+3 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,9 @@
		<!-- Default for Settings.System.VIBRATE_WHEN_RINGING -->
		<bool name="def_vibrate_when_ringing">false</bool>

		<!-- Default for Settings.Global.APPLY_RAMPING_RINGER -->
		<bool name="def_apply_ramping_ringer">false</bool>

		<!-- Default for Settings.Secure.CHARGING_VIBRATION_ENABLED -->
		<bool name="def_charging_vibration_enabled">true</bool>

+19 −1

Original line number	Diff line number	Diff line
		@@ -3237,7 +3237,7 @@ public class SettingsProvider extends ContentProvider {
		}

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 174;
		private static final int SETTINGS_VERSION = 175;

		private final int mUserId;

		@@ -4270,6 +4270,24 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 174;
		}

		if (currentVersion == 174) {
		// Version 174: Set the default value for Global Settings: APPLY_RAMPING_RINGER

		final SettingsState globalSettings = getGlobalSettingsLocked();

		Setting currentRampingRingerSetting = globalSettings.getSettingLocked(
		Settings.Global.APPLY_RAMPING_RINGER);
		if (currentRampingRingerSetting.isNull()) {
		globalSettings.insertSettingLocked(
		Settings.Global.APPLY_RAMPING_RINGER,
		getContext().getResources().getBoolean(
		R.bool.def_apply_ramping_ringer) ? "1" : "0", null,
		true, SettingsState.SYSTEM_PACKAGE_NAME);
		}

		currentVersion = 175;
		}

		// vXXX: Add new settings above this point.

		if (currentVersion != newVersion) {