PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ic9d1b08c,Id6db9ce2,I7b980218

Browse Source 
* changes:
  Add zen starred contacts preference
  Clear deprecated effects when saving zen policy
  DND settings redesign
This commit is contained in:
TreeHugger Robot
2018-05-11 20:33:10 +00:00
committed by Android (Google) Code Review
parent 938176292f f002dcf43b
commit d43283b53a
28 changed files with 1377 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -106,9 +106,10 @@ import com.android.settings.notification.NotificationStation;
import com.android.settings.notification.SoundSettings;
import com.android.settings.notification.ZenAccessSettings;
import com.android.settings.notification.ZenModeAutomationSettings;
import com.android.settings.notification.ZenModeBehaviorSettings;
import com.android.settings.notification.ZenModeMsgEventReminderSettings;
import com.android.settings.notification.ZenModeBlockedEffectsSettings;
import com.android.settings.notification.ZenModeEventRuleSettings;
import com.android.settings.notification.ZenModeRestrictNotificationsSettings;
import com.android.settings.notification.ZenModeScheduleRuleSettings;
import com.android.settings.notification.ZenModeSettings;
import com.android.settings.password.ChooseLockPassword;
@@ -220,7 +221,6 @@ public class SettingsGateway {
ApnSettings.class.getName(),
ApnEditor.class.getName(),
WifiCallingSettings.class.getName(),
ZenModeBehaviorSettings.class.getName(),
ZenModeScheduleRuleSettings.class.getName(),
ZenModeEventRuleSettings.class.getName(),
ZenModeBlockedEffectsSettings.class.getName(),