Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev (1f3c8278) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4152,7 +4152,8 @@ public final class Settings {
	SHOW_BATTERY_PERCENT,		SHOW_BATTERY_PERCENT,
	NOTIFICATION_VIBRATION_INTENSITY,		NOTIFICATION_VIBRATION_INTENSITY,
	HAPTIC_FEEDBACK_INTENSITY,		HAPTIC_FEEDBACK_INTENSITY,
	DISPLAY_COLOR_MODE		DISPLAY_COLOR_MODE,
			NOTIFICATION_LIGHT_PULSE,
	};		};

	/**		/**
	@@ -4355,6 +4356,7 @@ public final class Settings {
	VALIDATORS.put(WIFI_STATIC_DNS1, WIFI_STATIC_DNS1_VALIDATOR);		VALIDATORS.put(WIFI_STATIC_DNS1, WIFI_STATIC_DNS1_VALIDATOR);
	VALIDATORS.put(WIFI_STATIC_DNS2, WIFI_STATIC_DNS2_VALIDATOR);		VALIDATORS.put(WIFI_STATIC_DNS2, WIFI_STATIC_DNS2_VALIDATOR);
	VALIDATORS.put(SHOW_BATTERY_PERCENT, SHOW_BATTERY_PERCENT_VALIDATOR);		VALIDATORS.put(SHOW_BATTERY_PERCENT, SHOW_BATTERY_PERCENT_VALIDATOR);
			VALIDATORS.put(NOTIFICATION_LIGHT_PULSE, BOOLEAN_VALIDATOR);
	}		}

	/**		/**
	@@ -8173,6 +8175,8 @@ public final class Settings {
	ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES_VALIDATOR); //legacy restore setting		ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES_VALIDATOR); //legacy restore setting
	VALIDATORS.put(HUSH_GESTURE_USED, HUSH_GESTURE_USED_VALIDATOR);		VALIDATORS.put(HUSH_GESTURE_USED, HUSH_GESTURE_USED_VALIDATOR);
	VALIDATORS.put(MANUAL_RINGER_TOGGLE_COUNT, MANUAL_RINGER_TOGGLE_COUNT_VALIDATOR);		VALIDATORS.put(MANUAL_RINGER_TOGGLE_COUNT, MANUAL_RINGER_TOGGLE_COUNT_VALIDATOR);
			VALIDATORS.put(LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, BOOLEAN_VALIDATOR);
			VALIDATORS.put(LOCK_SCREEN_SHOW_NOTIFICATIONS, BOOLEAN_VALIDATOR);
	}		}

	/**		/**

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,6 @@ public class SettingsBackupTest {
	Settings.System.LOCKSCREEN_DISABLED, // ?		Settings.System.LOCKSCREEN_DISABLED, // ?
	Settings.System.MEDIA_BUTTON_RECEIVER, // candidate for backup?		Settings.System.MEDIA_BUTTON_RECEIVER, // candidate for backup?
	Settings.System.MUTE_STREAMS_AFFECTED, // candidate for backup?		Settings.System.MUTE_STREAMS_AFFECTED, // candidate for backup?
	Settings.System.NOTIFICATION_LIGHT_PULSE, // candidate for backup?
	Settings.System.NOTIFICATION_SOUND_CACHE, // internal cache		Settings.System.NOTIFICATION_SOUND_CACHE, // internal cache
	Settings.System.POINTER_LOCATION, // backup candidate?		Settings.System.POINTER_LOCATION, // backup candidate?
	Settings.System.RINGTONE_CACHE, // internal cache		Settings.System.RINGTONE_CACHE, // internal cache
	@@ -554,10 +553,8 @@ public class SettingsBackupTest {
	Settings.Secure.LAST_SETUP_SHOWN,		Settings.Secure.LAST_SETUP_SHOWN,
	Settings.Secure.LOCATION_CHANGER,		Settings.Secure.LOCATION_CHANGER,
	Settings.Secure.LOCATION_MODE,		Settings.Secure.LOCATION_MODE,
	Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, // Candidate?
	Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, // Candidate?		Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, // Candidate?
	Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,		Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,
	Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, // Candidate?
	Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,		Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
	Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,		Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,
	Settings.Secure.MULTI_PRESS_TIMEOUT,		Settings.Secure.MULTI_PRESS_TIMEOUT,