Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b992c345 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Add notification settings to backup&restore"

parents bd941835 afc94d72

core/java/android/provider/Settings.java

+7 −1
Original line number Diff line number Diff line
@@ -4161,7 +4161,8 @@ public final class Settings { 
            NOTIFICATION_VIBRATION_INTENSITY,

            HAPTIC_FEEDBACK_INTENSITY,

            DISPLAY_COLOR_MODE,

            ALARM_ALERT

            ALARM_ALERT,

            NOTIFICATION_LIGHT_PULSE,

        };















        /**










@@ -4364,6 +4365,7 @@ public final class Settings {













            VALIDATORS.put(WIFI_STATIC_DNS1, WIFI_STATIC_DNS1_VALIDATOR);















            VALIDATORS.put(WIFI_STATIC_DNS2, WIFI_STATIC_DNS2_VALIDATOR);















            VALIDATORS.put(SHOW_BATTERY_PERCENT, SHOW_BATTERY_PERCENT_VALIDATOR);













            VALIDATORS.put(NOTIFICATION_LIGHT_PULSE, BOOLEAN_VALIDATOR);















        }





























        /**










@@ -8019,6 +8021,8 @@ public final class Settings {













            MANUAL_RINGER_TOGGLE_COUNT,















            HUSH_GESTURE_USED,















            IN_CALL_NOTIFICATION_ENABLED,













            LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,













            LOCK_SCREEN_SHOW_NOTIFICATIONS,















        };





























        /**










@@ -8161,6 +8165,8 @@ public final class Settings {













            VALIDATORS.put(HUSH_GESTURE_USED, HUSH_GESTURE_USED_VALIDATOR);















            VALIDATORS.put(MANUAL_RINGER_TOGGLE_COUNT, MANUAL_RINGER_TOGGLE_COUNT_VALIDATOR);















            VALIDATORS.put(IN_CALL_NOTIFICATION_ENABLED, IN_CALL_NOTIFICATION_ENABLED_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
Diff line number
Diff line








@@ -66,7 +66,6 @@ public class SettingsBackupTest {













                    Settings.System.LOCKSCREEN_DISABLED, // ?















                    Settings.System.MEDIA_BUTTON_RECEIVER, // 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.POINTER_LOCATION, // backup candidate?















                    Settings.System.DEBUG_ENABLE_ENHANCED_CALL_BLOCKING, // used for testing only










@@ -560,10 +559,8 @@ public class SettingsBackupTest {













                 Settings.Secure.LAST_SETUP_SHOWN,















                 Settings.Secure.LOCATION_CHANGER,















                 Settings.Secure.LOCATION_MODE,













                 Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, // Candidate?















                 Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, // Candidate?















                 Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,













                 Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, // Candidate?















                 Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,















                 Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,















                 Settings.Secure.MULTI_PRESS_TIMEOUT,