Update appearance of notifications on locks screen settings page

Added `What to show on lock screen` section title. Changed the order
of switches according to the latest design. Updated texts.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: manual
Change-Id: Ia8d472ead290c1a1ec0eeb34bc8a11cd31c6870c
This commit is contained in:
Yining Liu
2024-12-24 00:30:41 +00:00
parent 7c8e313d11
commit b5fa953d4a
2 changed files with 31 additions and 24 deletions

View File

@@ -8863,8 +8863,8 @@
<!-- Configure notifications: Value for lockscreen notifications: show all notifications [CHAR LIMIT=60] --> <!-- Configure notifications: Value for lockscreen notifications: show all notifications [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_show_full_list">Full list</string> <string name="lock_screen_notifs_show_full_list">Full list</string>
<!-- Configure notifications: Value for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=60] --> <!-- Configure notifications: Value for lockscreen notifications: show compact notifications (minimalism on) [CHAR LIMIT=30] -->
<string name="lock_screen_notifs_show_compact">Compact</string> <string name="lock_screen_notifs_show_compact">Compact View</string>
<!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] --> <!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->
<string name="lock_screen_notifs_title">Notifications on lock screen</string> <string name="lock_screen_notifs_title">Notifications on lock screen</string>
@@ -8928,8 +8928,8 @@
<!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=NONE] --> <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
<string name="lock_screen_notifications_interstitial_message_profile">When your device is locked, how do you want profile notifications to show?</string> <string name="lock_screen_notifications_interstitial_message_profile">When your device is locked, how do you want profile notifications to show?</string>
<!-- Notification Settings > Notifications on lock screen > Title for hiding seen notifications toggle. [CHAR LIMIT=60] --> <!-- Notification Settings > Notifications on lock screen > Title for showing notifications on the lock screen. [CHAR LIMIT=100] -->
<string name="lock_screen_notification_hide_seen_title">Hide seen notifications</string> <string name="lockscreen_notification_what_to_show_title">What to show on lock screen</string>
<!-- Notification Settings > Notifications on lock screen > Summary for hiding seen notifications toggle. [CHAR LIMIT=100] --> <!-- Notification Settings > Notifications on lock screen > Summary for hiding seen notifications toggle. [CHAR LIMIT=100] -->
<string name="lock_screen_notification_hide_seen_summary">Seen notifications are removed from the lock screen.</string> <string name="lock_screen_notification_hide_seen_summary">Seen notifications are removed from the lock screen.</string>
@@ -8937,8 +8937,11 @@
<!-- Notification Settings > Notifications on lock screen > Title for hiding silent notifications toggle. [CHAR LIMIT=60] --> <!-- Notification Settings > Notifications on lock screen > Title for hiding silent notifications toggle. [CHAR LIMIT=60] -->
<string name="lock_screen_notification_hide_silent_title">Hide silent notifications</string> <string name="lock_screen_notification_hide_silent_title">Hide silent notifications</string>
<!-- Notification Settings > Notifications on lock screen > Summary for hiding silent notifications toggle. [CHAR LIMIT=100] --> <!-- Notification Settings > Notifications on lock screen > Title for hiding sensitive notification content on lock screen. [CHAR LIMIT=60] -->
<string name="lock_screen_notification_hide_silent_summary">Silent notifications and conversations are removed from the lock screen.</string> <string name="lock_screen_notification_hide_sensitive_content_title">Hide sensitive content</string>
<!-- Notification Settings > Notifications on lock screen > Title for hiding sensitive work profile notification content on lock screen. [CHAR LIMIT=100] -->
<string name="lock_screen_notification_hide_sensitive_work_content_title">Hide sensitive work profile content</string>
<!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=30] --> <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their profile notifications to appear when the device is locked [CHAR LIMIT=30] -->
<string name="lock_screen_notifications_interstitial_title_profile">Profile notifications</string> <string name="lock_screen_notifications_interstitial_title_profile">Profile notifications</string>

View File

@@ -44,26 +44,30 @@
android:layout="@layout/notification_ls_minimalism_selector" android:layout="@layout/notification_ls_minimalism_selector"
settings:controller="com.android.settings.notification.lockscreen.MinimalismPreferenceController" /> settings:controller="com.android.settings.notification.lockscreen.MinimalismPreferenceController" />
<com.android.settingslib.RestrictedSwitchPreference <PreferenceCategory
android:key="lock_screen_notification_show_sensitive_toggle" android:key="lockscreen_notification_what_to_show"
android:title="@string/lock_screen_notifications_summary_hide" android:title="@string/lockscreen_notification_what_to_show_title">
settings:controller="com.android.settings.notification.LockScreenNotificationShowSensitiveToggleController" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="work_profile_show_sensitive_notif_toggle"
android:title="@string/lock_screen_notifications_summary_hide_profile"
settings:controller="com.android.settings.notification.LockScreenNotificationShowSensitiveToggleController" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="lock_screen_notification_hide_seen_toggle" android:key="lock_screen_notification_hide_seen_toggle"
android:title="@string/lock_screen_notification_hide_seen_title" android:title="@string/lock_screen_notification_hide_seen_summary"
android:summary="@string/lock_screen_notification_hide_seen_summary"
settings:controller="com.android.settings.notification.LockScreenNotificationHideSeenToggleController" /> settings:controller="com.android.settings.notification.LockScreenNotificationHideSeenToggleController" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="lock_screen_notification_hide_silent_toggle" android:key="lock_screen_notification_hide_silent_toggle"
android:title="@string/lock_screen_notification_hide_silent_title" android:title="@string/lock_screen_notification_hide_silent_title"
android:summary="@string/lock_screen_notification_hide_silent_summary"
settings:controller="com.android.settings.notification.LockScreenNotificationHideSilentToggleController" /> settings:controller="com.android.settings.notification.LockScreenNotificationHideSilentToggleController" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="lock_screen_notification_show_sensitive_toggle"
android:title="@string/lock_screen_notification_hide_sensitive_content_title"
settings:controller="com.android.settings.notification.LockScreenNotificationShowSensitiveToggleController" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="work_profile_show_sensitive_notif_toggle"
android:title="@string/lock_screen_notification_hide_sensitive_work_content_title"
settings:controller="com.android.settings.notification.LockScreenNotificationShowSensitiveToggleController" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>