diff options
| author | Beth Thibodeau <ethibodeau@google.com> | 2020-06-19 22:40:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 22:40:39 +0000 |
| commit | 7a2dfd34225aaaed15be2e3cc1ce7c75e8ce4125 (patch) | |
| tree | e38df5e89301f78bee11189f16d867aabcc81f5f /packages/SettingsProvider | |
| parent | dd183df4374e9d7e3bd9c2c55ab0134d67f212ea (diff) | |
| parent | c1bc307bce92c9be7f675a851342c15f23db0d45 (diff) | |
[DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534
Change-Id: Ie0520c407c27112a05049ef6627528e204ffdff2
Diffstat (limited to 'packages/SettingsProvider')
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index c04a1ba689b9..d05e6e16bc1a 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -164,7 +164,8 @@ public class SecureSettings { Settings.Secure.AWARE_TAP_PAUSE_GESTURE_COUNT, Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT, Settings.Secure.PEOPLE_STRIP, + Settings.Secure.MEDIA_CONTROLS_RESUME, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE, - Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, + Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 76746e5488b6..fa810bdf3a4e 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -243,6 +243,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.DISPLAY_DENSITY_FORCED, NON_NEGATIVE_INTEGER_VALIDATOR); VALIDATORS.put(Secure.TAP_GESTURE, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.PEOPLE_STRIP, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.MEDIA_CONTROLS_RESUME, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_MODE, new InclusiveIntegerRangeValidator( Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN, |