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

Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: a31916bd8f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I624e2cc82b796788869bef6a60efb441005bdc1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Tuttle
2023-05-17 16:33:28 +00:00
committed by Automerger Merge Worker
parent bdffa07cb8 a31916bd8f
commit 77c21d9e45
5 changed files with 452 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
res/xml/app_notification_settings.xml
View File

@@ -59,38 +59,57 @@
<com.android.settingslib.RestrictedSwitchPreference
android:key="allow_sound"
android:title="@string/allow_interruption"
android:summary="@string/allow_interruption_summary" />
android:summary="@string/allow_interruption_summary"
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
<!-- Visibility Override -->
<com.android.settings.RestrictedListPreference
android:key="visibility_override"
android:title="@string/app_notification_visibility_override_title"/>
android:title="@string/app_notification_visibility_override_title"
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
<!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary"/>
android:summary="@string/app_notification_override_dnd_summary"
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
<!-- Allow full-screen intents -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="fsi_permission"
android:title="@string/app_notification_fsi_permission_title"
android:summary="@string/app_notification_fsi_permission_summary"
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
<!-- Show badge -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"
android:title="@string/notification_badge_title"
settings:useAdditionalSummary="true"
android:order="1001"
android:icon="@drawable/ic_notification_dot"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin"
android:order="1001"
settings:allowDividerAbove="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
settings:allowDividerBelow="false" />
<Preference
android:key="app_link"
android:order="1003"
android:icon="@drawable/ic_settings_24dp"
android:title="@string/app_settings_link" />
android:title="@string/app_settings_link"
android:order="1003"
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
<com.android.settingslib.widget.FooterPreference
android:key="deleted"
android:icon="@drawable/ic_trash_can"
android:order="8000" />
android:order="8000"
settings:allowDividerAbove="true"
settings:allowDividerBelow="false" />
</PreferenceScreen>