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

Commit 0862e80e authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Add screensaver settings to backup list" into oc-dr1-dev am: 2c3c58d9 

am: 4c30304a

Change-Id: Icac69838617de8c58a0d9090dc4d78b14ad1a976
parents af6f67b9 4c30304a

core/java/android/provider/Settings.java

+4 −0
Original line number Diff line number Diff line
@@ -7191,6 +7191,10 @@ public final class Settings { 
            VR_DISPLAY_MODE,

            NOTIFICATION_BADGING,

            QS_AUTO_ADDED_TILES,

            SCREENSAVER_ENABLED,

            SCREENSAVER_COMPONENTS,

            SCREENSAVER_ACTIVATE_ON_DOCK,

            SCREENSAVER_ACTIVATE_ON_SLEEP,

        };



        /** @hide */

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

+0 −4
Original line number Diff line number Diff line
@@ -465,11 +465,7 @@ public class SettingsBackupTest { 
                 Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,

                 Settings.Secure.PAYMENT_SERVICE_SEARCH_URI,

                 Settings.Secure.PRINT_SERVICE_SEARCH_URI,

                 Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, // Candidate?

                 Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, // Candidate?

                 Settings.Secure.SCREENSAVER_COMPONENTS,

                 Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT, // Candidate?

                 Settings.Secure.SCREENSAVER_ENABLED, // Candidate?

                 Settings.Secure.SEARCH_GLOBAL_SEARCH_ACTIVITY,

                 Settings.Secure.SEARCH_MAX_RESULTS_PER_SOURCE,

                 Settings.Secure.SEARCH_MAX_RESULTS_TO_DISPLAY,