Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add screensaver settings to backup list" into oc-dr1-dev

Browse Source 
am: 2c3c58d917

Change-Id: I981327b35f341600f908d479d4a4d36356b18b1d
This commit is contained in:
Jason Monk
2017-07-10 20:29:25 +00:00
committed by android-build-merger
parent 198ac8a2f3 2c3c58d917
commit 4c30304a8c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/Settings.java
View File

@@ -7158,6 +7158,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,
};
/**

4
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -456,11 +456,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,