Merge "Improves Settings search result of Flash Notifications" into udc-dev

This commit is contained in:
Angela Wang
2023-04-02 05:59:32 +00:00
committed by Android (Google) Code Review
4 changed files with 17 additions and 10 deletions

View File

@@ -11958,24 +11958,26 @@
<string name="accessibility_fingerprint_label">Fingerprint sensor</string>
<!-- Accessibility Flash Notification -->
<!-- Title of the Flash Notification entry [CHAR LIMIT=35] -->
<!-- Title of the Flash Notifications entry. [CHAR LIMIT=35] -->
<string name="flash_notifications_title">Flash notifications</string>
<!-- Title for flash notifications page footer. [CHAR LIMIT=45] -->
<!-- Title of the Flash Notifications page footer. [CHAR LIMIT=45] -->
<string name="flash_notifications_about_title">About flash notifications</string>
<!-- Summary of the Flash Notification preference if all flash alerts are off. [CHAR LIMIT=60] -->
<!-- Summary of the Flash Notifications preference if all flash alerts are off. [CHAR LIMIT=60] -->
<string name="flash_notifications_summary_off">Off</string>
<!-- Summary of the Flash Notification preference if only camera flash is on. [CHAR LIMIT=60] -->
<!-- Summary of the Flash Notifications preference if only camera flash is on. [CHAR LIMIT=60] -->
<string name="flash_notifications_summary_on_camera">On / Camera flash</string>
<!-- Summary of the Flash Notification preference if only screen flash is on. [CHAR LIMIT=60] -->
<!-- Summary of the Flash Notifications preference if only screen flash is on. [CHAR LIMIT=60] -->
<string name="flash_notifications_summary_on_screen">On / Screen flash</string>
<!-- Summary of the Flash Notification preference if both flash alerts are on. [CHAR LIMIT=60] -->
<!-- Summary of the Flash Notifications preference if both flash alerts are on. [CHAR LIMIT=60] -->
<string name="flash_notifications_summary_on_camera_and_screen">On / Camera and screen flash</string>
<!-- Introduction in Flash Notification page to introduce flash notifications feature. [CHAR LIMIT=NONE] -->
<!-- Introduction in Flash Notifications page to introduce flash notifications feature. [CHAR LIMIT=NONE] -->
<string name="flash_notifications_intro">Flash the camera light or the screen when you receive notifications or when alarms sound</string>
<!-- Introduction in Flash Notification page to introduce flash notifications feature without camera flash option. [CHAR LIMIT=NONE] -->
<!-- Introduction in Flash Notifications page to introduce flash notifications feature without camera flash option. [CHAR LIMIT=NONE] -->
<string name="flash_notifications_intro_without_camera_flash">Flash the screen when you receive notifications or when alarms sound</string>
<!-- Notes in Flash Notification page footer for something should be aware. [CHAR LIMIT=NONE] -->
<!-- Notes in Flash Notifications page footer for something should be aware. [CHAR LIMIT=NONE] -->
<string name="flash_notifications_note">Use flash notifications with caution if you\u0027re light sensitive</string>
<!-- Search keywords for Flash Notifications settings. [CHAR LIMIT=NONE] -->
<string name="flash_notifications_keywords">flash, light, hard of hearing, hearing loss</string>
<!-- Label of the button to preview the selected Flash Notification effects. [CHAR LIMIT=20]-->
<string name="flash_notifications_preview">Preview</string>
<!-- Title of the camera flash in Flash Notification page. [CHAR LIMIT=60] -->

View File

@@ -152,10 +152,12 @@
<Preference
android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"
android:key="flash_notifications_preference_accessibility"
android:icon="@drawable/ic_flash_notification"
android:key="flash_notifications_preference"
android:persistent="false"
android:title="@string/flash_notifications_title"
settings:keywords="@string/flash_notifications_keywords"
settings:searchable="true"
settings:controller="com.android.settings.accessibility.FlashNotificationsPreferenceController" />
<Preference

View File

@@ -134,6 +134,7 @@
android:order="19"
android:persistent="false"
android:title="@string/flash_notifications_title"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.FlashNotificationsPreferenceController" />
<com.android.settingslib.RestrictedPreference

View File

@@ -21,6 +21,7 @@
<com.android.settingslib.widget.TopIntroPreference
android:key="flash_notifications_intro"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.FlashNotificationsIntroPreferenceController" />
<com.android.settingslib.widget.IllustrationPreference
@@ -43,6 +44,7 @@
<com.android.settings.accessibility.FlashNotificationsPreviewPreference
android:key="flash_notifications_preview"
android:title="@string/flash_notifications_preview"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.FlashNotificationsPreviewPreferenceController" />
<com.android.settings.accessibility.AccessibilityFooterPreference