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

Replaced dnd priority setting page w/ behavior.

Browse Source 
Bug: 63077372
Test: manual, make -j20 RunSettingsRoboTests
Change-Id: I79fd431da0cbed1407f0dab38e64f0bdb3ff3feb
This commit is contained in:
Beverly
2017-09-25 14:14:31 -04:00
parent be5e7510dd
commit ad898e6928
12 changed files with 303 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
res/xml/zen_mode_behavior_settings.xml Normal file
View File

@@ -0,0 +1,65 @@
<?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_behavior_settings_page"
android:title="@string/zen_mode_behavior_settings_title" >
<PreferenceCategory
android:title="@string/zen_mode_behavior_allow_title"
android:key="zen_mode_behavior_allow_preferences">
<!-- Alarms -->
<SwitchPreference
android:key="zen_mode_alarms"
android:title="@string/zen_mode_alarms"/>
<!-- Media -->
<SwitchPreference
android:key="zen_mode_media"
android:title="@string/zen_mode_media_system_other"/>
<!-- Reminders -->
<SwitchPreference
android:key="zen_mode_reminders"
android:title="@string/zen_mode_reminders"/>
<!-- Events -->
<SwitchPreference
android:key="zen_mode_events"
android:title="@string/zen_mode_events"/>
<!-- Messages -->
<DropDownPreference
android:key="zen_mode_messages"
android:title="@string/zen_mode_messages"
android:summary="%s" />
<!-- Calls -->
<DropDownPreference
android:key="zen_mode_calls"
android:title="@string/zen_mode_calls"
android:summary="%s" />
<!-- Repeat callers -->
<SwitchPreference
android:key="zen_mode_repeat_callers"
android:title="@string/zen_mode_repeat_callers"/>
</PreferenceCategory>
</PreferenceScreen>

57
res/xml/zen_mode_priority_settings.xml
View File

@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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_priority_settings"
android:title="@string/zen_mode_priority_settings_title" >
<!-- Reminders -->
<SwitchPreference
android:key="reminders"
android:title="@string/zen_mode_reminders"/>
<!-- Events -->
<SwitchPreference
android:key="events"
android:title="@string/zen_mode_events"/>
<!-- Alarms -->
<SwitchPreference
android:key="alarms"
android:title="@string/zen_mode_alarms"
android:summary="@string/zen_mode_alarms_summary"
android:enabled="false"
android:defaultValue="true"/>
<!-- Messages -->
<DropDownPreference
android:key="messages"
android:title="@string/zen_mode_messages"
android:summary="%s" />
<!-- Calls -->
<DropDownPreference
android:key="calls"
android:title="@string/zen_mode_calls"
android:summary="%s" />
<!-- Repeat callers -->
<SwitchPreference
android:key="repeat_callers"
android:title="@string/zen_mode_repeat_callers"/>
</PreferenceScreen>

11
res/xml/zen_mode_settings.xml
View File

@@ -19,20 +19,19 @@
android:key="zen_mode_settings"
android:title="@string/zen_mode_settings_title" >
<!-- Priority only allows -->
<Preference
android:key="priority_settings"
android:title="@string/zen_mode_priority_settings_title"
android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
android:key="zen_mode_behavior_settings"
android:title="@string/zen_mode_behavior_settings_title"
android:fragment="com.android.settings.notification.ZenModeBehaviorSettings" />
<!-- Visual interruptions -->
<Preference
android:key="visual_interruptions_settings"
android:key="zen_mode_visual_interruptions_settings"
android:title="@string/zen_mode_visual_interruptions_settings_title"
android:fragment="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
<!-- Automatic rules -->
<PreferenceCategory
android:key="automatic_rules"
android:key="zen_mode_automatic_rules"
android:title="@string/zen_mode_automation_settings_title" />
</PreferenceScreen>