cb6fe394d02a323942905caf37b4ceb3bfbe5cc5 - SHIFTPHONES/android/packages/apps/Settings

commit	cb6fe394d02a323942905caf37b4ceb3bfbe5cc5	[log] [tgz]
author	Julia Reynolds <juliacr@google.com>	Fri May 04 08:54:53 2018 -0400
committer	Julia Reynolds <juliacr@google.com>	Fri May 04 14:45:43 2018 -0400
tree	f6df33453953bbdf8f53d843dc5836624c71b1c1
parent	7309dddaa35a05a1eb9ab3b004d167a3391480fe [diff]

DO NOT MERGE DND settings redesign

Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976

AndroidManifest.xml[diff]
res/values/strings.xml[diff]
res/xml/zen_mode_behavior_settings.xml[Deleted - diff]
res/xml/zen_mode_calls_settings.xml[Added - diff]
res/xml/zen_mode_msg_event_reminder_settings.xml[Added - diff]
res/xml/zen_mode_restrict_notifications_settings.xml[diff]
res/xml/zen_mode_settings.xml[diff]
res/xml/zen_mode_sound_vibration_settings.xml[Added - diff]
src/com/android/settings/core/gateway/SettingsGateway.java[diff]
src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java[Renamed from src/com/android/settings/notification/ZenModeBehaviorPreferenceController.java - diff]
src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java[diff]
src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java[Copied from src/com/android/settings/notification/ZenModeBehaviorPreferenceController.java - diff]
src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java[Copied from src/com/android/settings/notification/ZenModeBehaviorPreferenceController.java - diff]
src/com/android/settings/notification/ZenModeCallsSettings.java[Copied from src/com/android/settings/notification/ZenModeBehaviorSettings.java - diff]
src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java[Renamed from src/com/android/settings/notification/ZenModeBehaviorSettings.java - diff]
src/com/android/settings/notification/ZenModeSettings.java[diff]
src/com/android/settings/notification/ZenModeSoundVibrationSettings.java[Copied from src/com/android/settings/notification/ZenModeBehaviorSettings.java - diff]
src/com/android/settings/search/SearchIndexableResourcesImpl.java[diff]
tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java[Added - diff]
tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java[diff]
tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java[Added - diff]
tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java[Added - diff]
tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java[diff]

23 files changed

tree: f6df33453953bbdf8f53d843dc5836624c71b1c1