Added zen settings messages and calls preferences.

- Made ZenModeSettings and ZenModeBehaviorSettings a DashboardFragment
- Switches in ZenModeBehaviorSettings all have their own preference controllers
- Instead of a dropdown, messages & calls have their own pages & preference controllers
- Added basic turn on/off DND button in settings (dialog not yet implemented)

Bug: 63077372
Fixes: 69057767
Test: make -j40 RunSettingsRoboTests
Change-Id: I1c70f77053713f66f873ee578477f23cfd7985bb
This commit is contained in:
Beverly
2017-10-27 14:44:23 -04:00
parent a40f6a2a45
commit a58e52a0be
53 changed files with 3888 additions and 815 deletions

View File

@@ -19,5 +19,15 @@
android:key="zen_mode_automation_settings_page"
android:title="@string/zen_mode_automation_settings_page_title" >
<!-- Rules added at runtime -->
<PreferenceCategory
android:key="zen_mode_automatic_rules">
<!-- Rules added at runtime -->
</PreferenceCategory>
<Preference
android:key="zen_mode_add_automatic_rule"
android:icon="@drawable/ic_menu_add"
android:title="@string/zen_mode_add_rule"/>
</PreferenceScreen>

View File

@@ -46,17 +46,16 @@
android:key="zen_mode_events"
android:title="@string/zen_mode_events"/>
<!-- Messages -->
<DropDownPreference
<Preference
android:key="zen_mode_messages"
android:title="@string/zen_mode_messages"
android:summary="%s" />
android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
<!-- Calls -->
<DropDownPreference
<Preference
android:key="zen_mode_calls"
android:title="@string/zen_mode_calls"
android:summary="%s" />
android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
<!-- Repeat callers -->
<SwitchPreference

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:key="zen_mode_calls_settings"
android:title="@string/zen_mode_calls" />

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:key="zen_mode_messages_settings"
android:title="@string/zen_mode_messages" />

View File

@@ -19,6 +19,7 @@
android:key="zen_mode_settings"
android:title="@string/zen_mode_settings_title">
<!-- Priority behavior settings -->
<Preference
android:key="zen_mode_behavior_settings"
android:title="@string/zen_mode_behavior_settings_title"
@@ -29,4 +30,14 @@
android:key="zen_mode_automation_settings"
android:title="@string/zen_mode_automation_settings_title"
android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
<!-- Turn on DND button -->
<!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
<PreferenceCategory>
<com.android.settings.applications.LayoutPreference
android:key="zen_mode_settings_button_container"
android:selectable="false"
android:layout="@layout/zen_mode_settings_button" />
</PreferenceCategory>
</PreferenceScreen>