OSDN Git Service

DO NOT MERGE Clear deprecated effects when saving zen policy
authorBeverly <beverlyt@google.com>
Tue, 8 May 2018 14:41:25 +0000 (10:41 -0400)
committerBeverly Tai <beverlyt@google.com>
Wed, 9 May 2018 18:50:48 +0000 (18:50 +0000)
commit17c6de8e68a972cff871fd9931861748e9879b81
treef995eefd88b87013679b420995442e4d04a38648
parente30007dcc0ea2fab5c81cb73cbec2f3008a03e39
DO NOT MERGE Clear deprecated effects when saving zen policy

- Deprecated effects are set in NotificationManagerService,
so unset them before setting the NotificationPolicy
- When user clicks on Custom, they are brought to the custom vis effects
page instead of resetting custom values to presets

Fixes: 79383781
Test: manual
Test: NotificationManagerServiceTest testSetNotificationPolicy_preP_setOldNewFields
Change-Id: Id6db9ce2aaeed6321389f8dbfbea65eda30c74ad
src/com/android/settings/notification/ZenModeBackend.java
src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java