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

Config notifs page updates

Browse Source 
- Remove unused settings
- Regroup and combine lockscreen settings. The original
lockscreen controller is used in other places (SUW and privacy)
and so it's left untouched for those uses for now.

Test: atest
Bug: 132971502
Change-Id: Ic82817ff98cab27ca35b9488ae2e0eb6922a18e8
This commit is contained in:
Julia Reynolds
2019-05-21 10:21:21 -04:00
parent 6cb224b38b
commit 4fe79c266e
9 changed files with 895 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/values/strings.xml
View File

@@ -7974,6 +7974,32 @@
<!-- Configure Notifications: Title for the option controlling notifications for work profile. [CHAR LIMIT=30] -->
<string name="locked_work_profile_notification_title">When work profile is locked</string>
<!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_title">Notifications on lockscreen</string>
<!-- Configure notifications: Value for lockscreen notifications: all notifications shown
regardless of noisiness [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_show_all">Show alerting and silent notifications</string>
<!-- Configure notifications: Value for lockscreen notifications: show alerting notifications [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_show_alerting">Show alerting notifications only</string>
<!-- Configure notifications: Value for lockscreen notifications: don't show notifications [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_show_none">Don\u2019t show notifications</string>
<!-- Configure notifications: Title for redacting sensitive content on lockscreen [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_redact">Sensitive notifications</string>
<!-- Configure notifications: Summary for redacting sensitive content on lockscreen [CHAR LIMIT=120] -->
<string name="lock_screen_notifs_redact_summary">Show sensitive content when locked</string>
<!-- Configure notifications: Title for redacting sensitive content on lockscreen, work profile [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_redact_work">Sensitive work profile notifications</string>
<!-- Configure notifications: Summary for redacting sensitive content on lockscreen, work profile [CHAR LIMIT=120] -->
<string name="lock_screen_notifs_redact_work_summary">Show sensitive work profile content when locked</string>
<!-- Configure Notifications: Value for lockscreen notifications: all information will be
shown in notifications shown on a secure lock screen
[CHAR LIMIT=50] -->

116
res/xml/configure_notification_settings.xml
View File

@@ -26,27 +26,52 @@
settings:controller="com.android.settings.widget.VideoPreferenceController"
android:persistent="false" />
<Preference
android:key="gentle_notifications"
android:title="@string/gentle_notifications_title"
settings:controller="com.android.settings.notification.GentleNotificationsPreferenceController"
android:fragment="com.android.settings.notification.GentleNotificationSettings"/>
<!-- Empty category to draw divider -->
<PreferenceCategory
android:key="all_notifications_divider"
android:order="2"/>
<PreferenceCategory
android:key="configure_notifications_smart"
android:title="@string/smart_notifications_title"
android:key="recent_notifications_category"
android:title="@string/recent_notifications"
settings:allowDividerAbove="false"
android:order="3">
<SwitchPreference
android:key="asst_capability_prioritizer"
android:title="@string/asst_capability_prioritizer_title"
android:summary="@string/asst_capability_prioritizer_summary"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
<!-- Placeholder for a list of recent apps -->
<!-- See all apps button -->
<Preference
android:key="all_notifications"
android:title="@string/notifications_title"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
android:order="4">
<extra
android:name="classname"
android:value="com.android.settings.Settings$NotificationAppListActivity"/>
</Preference>
</PreferenceCategory>
<PreferenceCategory
android:key="configure_notifications_lock"
android:title="@string/lock_screen_notifications_title"
android:order="10">
<!-- When device is locked -->
<com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifs_title"
android:summary="@string/summary_placeholder" />
<SwitchPreference
android:key="asst_capabilities_actions_replies"
android:title="@string/asst_capabilities_actions_replies_title"
android:summary="@string/asst_capabilities_actions_replies_summary"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
android:key="lock_screen_redact"
android:title="@string/lock_screen_notifs_redact"
android:summary="@string/lock_screen_notifs_redact_summary"
settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
<SwitchPreference
android:key="lock_screen_work_redact"
android:title="@string/lock_screen_notifs_redact_work"
android:summary="@string/lock_screen_notifs_redact_work_summary"
settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
</PreferenceCategory>
<PreferenceCategory
@@ -54,19 +79,11 @@
android:order="15"
settings:initialExpandedChildrenCount="0">
<com.android.settings.RestrictedListPreference
android:key="swipe"
android:title="@string/swipe_direction_title"
android:entries="@array/swipe_direction_titles"
android:entryValues="@array/swipe_direction_values"
settings:controller="com.android.settings.notification.SwipeDirectionPreferenceController"/>
<!-- When device is locked -->
<com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title"
android:summary="@string/summary_placeholder"
settings:searchable="false"/>
<SwitchPreference
android:key="asst_capabilities_actions_replies"
android:title="@string/asst_capabilities_actions_replies_title"
android:summary="@string/asst_capabilities_actions_replies_summary"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
<!-- Notification badging -->
<SwitchPreference
@@ -102,45 +119,4 @@
settings:controller="com.android.settings.notification.ZenModePreferenceController"
settings:allowDividerAbove="false"/>
</PreferenceCategory>
<!-- Empty category to draw divider -->
<PreferenceCategory
android:key="all_notifications_divider"
android:order="20"/>
<PreferenceCategory
android:key="recent_notifications_category"
android:title="@string/recent_notifications"
settings:allowDividerAbove="false"
android:order="21">
<!-- Placeholder for a list of recent apps -->
<!-- See all apps button -->
<Preference
android:key="all_notifications"
android:title="@string/notifications_title"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
android:order="22">
<extra
android:name="classname"
android:value="com.android.settings.Settings$NotificationAppListActivity"/>
</Preference>
</PreferenceCategory>
<!-- Place work profile section at the bottom to avoid users thinking that any of the
above settings are specific to the work profile -->
<PreferenceCategory
android:key="lock_screen_notifications_profile_header"
android:title="@string/profile_section_header"
android:order="23"
settings:searchable="false">
<com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications_profile"
android:title="@string/locked_work_profile_notification_title"
android:summary="@string/summary_placeholder"
android:order="24"
settings:searchable="false"/>
</PreferenceCategory>
</PreferenceScreen>