Merge "Merge "Set the default value for Secure Settings: SKIP_GESTURE &... (592835eb) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/res/values/defaults.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -229,4 +229,10 @@

		<!-- Default for Settings.Secure.AWARE_ENABLED -->
		<bool name="def_aware_enabled">false</bool>

		<!-- Default for Settings.Secure.SKIP_GESTURE -->
		<bool name="def_skip_gesture">false</bool>

		<!-- Default for Settings.Secure.SILENCE_GESTURE -->
		<bool name="def_silence_gesture">false</bool>
		</resources>

+32 −1

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

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 178;
		private static final int SETTINGS_VERSION = 179;

		private final int mUserId;

		@@ -4359,6 +4359,37 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 178;
		}

		if (currentVersion == 178) {
		// Version 178: Set the default value for Secure Settings:
		// SKIP_GESTURE & SILENCE_GESTURE

		final SettingsState secureSettings = getSecureSettingsLocked(userId);

		final Setting skipGesture = secureSettings.getSettingLocked(
		Secure.SKIP_GESTURE);

		if (skipGesture.isNull()) {
		final boolean defSkipGesture = getContext().getResources().getBoolean(
		R.bool.def_skip_gesture);
		secureSettings.insertSettingLocked(
		Secure.SKIP_GESTURE, defSkipGesture ? "1" : "0",
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}

		final Setting silenceGesture = secureSettings.getSettingLocked(
		Secure.SILENCE_GESTURE);

		if (silenceGesture.isNull()) {
		final boolean defSilenceGesture = getContext().getResources().getBoolean(
		R.bool.def_silence_gesture);
		secureSettings.insertSettingLocked(
		Secure.SILENCE_GESTURE, defSilenceGesture ? "1" : "0",
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}

		currentVersion = 179;
		}


		// vXXX: Add new settings above this point.