diff options
| author | Beth Thibodeau <ethibodeau@google.com> | 2020-06-09 23:36:17 -0400 |
|---|---|---|
| committer | Beth Thibodeau <ethibodeau@google.com> | 2020-06-18 23:58:11 +0000 |
| commit | c1bc307bce92c9be7f675a851342c15f23db0d45 (patch) | |
| tree | c12d2dfce206cc38f5c22363406211643a951705 /packages/SettingsProvider/src | |
| parent | a7143d54c73c91768b767933b6576dc552524746 (diff) | |
[DO NOT MERGE] Support toggling resumption in Settings
Moved setting so we can use Tunable:
adb shell settings put secure qs_media_resumption 1
If setting is changed, removes all existing resume players
Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: atest com.android.systemui.media
Change-Id: Iad056fbad4520cfe762d9e9f5ed62d38ea1117b1
Diffstat (limited to 'packages/SettingsProvider/src')
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, |