- Add link in DND Conversations Page to the overall conversations list Settings page - Add custom_rule xml pages for custom schedule rule settings for messages and calls (so the UI is the same as before the message/calls redesign) - Change app exceptions to display apps with subtext indicating which notitfication channels are allowed to bypass dnd (previously, would display each channel individually) - Add individual AppBypassDnd channel pages where users can decide which channels will bypass DND for an app on a single page (AppChannelsBypassingDndSettings) - Only remove dnd bypassing apps preferences from the preference list if the list changed, else just update the preference itself to avoid the list from flashing Test: make RunSettingsRoboTests7 Bug: 151845457 Change-Id: If12d8921e1405aefb1066acc2ef5c55d216fe47a
		
			
				
	
	
		
			49 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			49 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
| <?xml version="1.0" encoding="utf-8"?>
 | |
| <!-- Copyright (C) 2020 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"
 | |
|     xmlns:settings="http://schemas.android.com/apk/res-auto"
 | |
|     android:key="conversation_list"
 | |
|     android:title="@string/zen_mode_conversations_title">
 | |
| 
 | |
|     <PreferenceCategory
 | |
|         android:key="important_conversations"
 | |
|         android:title="@string/important_conversations"
 | |
|         android:visibility="gone"
 | |
|         settings:allowDividerAbove="false"
 | |
|         settings:allowDividerBelow="true" >
 | |
|         <Preference
 | |
|             android:key="behavior"
 | |
|             android:summary="@string/important_conversation_behavior_summary"/>
 | |
|         <!-- Important conversations added here -->
 | |
|         <PreferenceCategory
 | |
|             android:key="important_conversations_list"
 | |
|             settings:allowDividerAbove="false"
 | |
|             settings:allowDividerBelow="false" >
 | |
|         </PreferenceCategory>
 | |
|     </PreferenceCategory>
 | |
| 
 | |
| 
 | |
|     <!--Other conversations added here -->
 | |
|     <PreferenceCategory
 | |
|         android:title="@string/other_conversations"
 | |
|         android:key="other_conversations"
 | |
|         settings:allowDividerAbove="true"
 | |
|         settings:allowDividerBelow="false" />
 | |
| 
 | |
| </PreferenceScreen>
 |