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

Merge "NAS Setting Migration" into sc-dev

Browse Source
This commit is contained in:
Chloris Kuo
2021-04-12 17:16:50 +00:00
committed by Android (Google) Code Review
parent 588e4e8d8b 2c955bbae2
commit ccd2bfc1a0
11 changed files with 315 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/configure_notification_settings.xml
View File

@@ -115,6 +115,11 @@
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
<SwitchPreference
android:key="notification_assistant"
android:title="@string/notification_assistant_title"
android:summary="@string/notification_assistant_summary"/>
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"

6
res/xml/configure_notification_settings_v2.xml
View File

@@ -155,5 +155,11 @@
android:order="22"
android:title="@string/notification_pulse_title"
settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
<SwitchPreference
android:key="notification_assistant"
android:order="23"
android:title="@string/notification_assistant_title"
android:summary="@string/notification_assistant_summary"/>
</PreferenceCategory>
</PreferenceScreen>

7
res/xml/special_access.xml
View File

@@ -80,13 +80,6 @@
android:value="com.android.settings.Settings$WriteSettingsActivity" />
</Preference>
<com.android.settingslib.widget.AppPreference
android:key="notification_assistant"
android:title="@string/notification_assistant_title"
android:summary="@string/summary_placeholder"
settings:fragment="com.android.settings.notification.NotificationAssistantPicker"
settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
<Preference
android:key="notification_access"
android:title="@string/manage_notification_access_title"