Merge "Handles Flash Notifications intro if there's no valid camera" into udc-dev am: a34ab52d0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22244838 Change-Id: I8ccb0aa36bb4dd4865659de2bb66742f2b422e08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -11970,6 +11970,8 @@
|
||||
<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] -->
|
||||
<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] -->
|
||||
<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] -->
|
||||
<string name="flash_notifications_note">Use flash notifications with caution if you\u0027re light sensitive</string>
|
||||
<!-- Label of the button to preview the selected Flash Notification effects. [CHAR LIMIT=20]-->
|
||||
|
@@ -21,12 +21,12 @@
|
||||
|
||||
<com.android.settingslib.widget.TopIntroPreference
|
||||
android:key="flash_notifications_intro"
|
||||
android:title="@string/flash_notifications_intro" />
|
||||
settings:controller="com.android.settings.accessibility.FlashNotificationsIntroPreferenceController" />
|
||||
|
||||
<com.android.settingslib.widget.IllustrationPreference
|
||||
android:key="flash_notifications_illustration"
|
||||
settings:searchable="false"
|
||||
settings:lottie_rawRes="@drawable/flash_notifications_illustration"/>
|
||||
settings:lottie_rawRes="@drawable/flash_notifications_illustration" />
|
||||
|
||||
<SwitchPreference
|
||||
android:key="camera_flash_notification_preference"
|
||||
|
Reference in New Issue
Block a user