Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "b308819928-ModesSettingsAppBreakthroughPage" into main

Browse Source 
* changes:
  Moves ZenModeBypassingAppsSettings into modes dir
  Adds modes settings page for bypassing apps
This commit is contained in:
Alexander Roederer
2024-05-29 14:20:02 +00:00
committed by Android (Google) Code Review
parent 310fc717c4 c50457613e
commit 4e10ac8dae
17 changed files with 1708 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/modes_rule_settings.xml
View File

@@ -34,6 +34,10 @@
android:key="zen_mode_people"
android:title="@string/zen_category_people"/>
<Preference
android:key="zen_mode_apps"
android:title="@string/zen_category_apps" />
<Preference
android:key="zen_other_settings"
android:title="@string/zen_category_exceptions" />

44
res/xml/zen_mode_apps_settings.xml Normal file
View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2024 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:title="@string/zen_mode_apps_title" >
<PreferenceCategory
android:key="zen_mode_apps_category"
android:title="@string/zen_mode_apps_category">
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_mode_apps_priority"
android:title="@string/zen_mode_apps_priority_apps"
settings:searchable="false"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_mode_apps_none"
android:title="@string/zen_mode_apps_none_apps"
settings:searchable="false"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_mode_apps_all"
android:title="@string/zen_mode_apps_all_apps"
settings:searchable="false"/>
</PreferenceCategory>
</PreferenceScreen>

37
res/xml/zen_mode_select_bypassing_apps.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2024 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:title="@string/zen_mode_bypassing_apps_title">
<PreferenceCategory
android:key="zen_mode_bypassing_apps_list"
android:title="@string/zen_mode_bypassing_apps_header">
<!-- apps that have notifications that can bypass DND are added here -->
</PreferenceCategory>
<Preference
android:key="zen_mode_bypassing_apps_add"
android:title="@string/zen_mode_bypassing_apps_add"
android:icon="@drawable/ic_add_24dp"
settings:allowDividerAbove="true" />
<com.android.settingslib.widget.FooterPreference
android:title="@string/zen_mode_bypassing_apps_footer" />
</PreferenceScreen>