Merge "Add search keyword for ambient display"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f917d81..ad9e29f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2579,6 +2579,7 @@
<!-- [CHAR LIMIT=30] Title of the preference that opens the Ambient display settings screen. -->
<string name="ambient_display_screen_title">Ambient display</string>
+
<!-- [CHAR LIMIT=50] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to be always on -->
<string name="ambient_display_screen_summary_always_on">Always on / Increased battery usage</string>
<!-- [CHAR LIMIT=30] Summary of the preference that opens the Ambient display settings screen, when Ambient display is set to show when new notifications come in. -->
@@ -6714,6 +6715,8 @@
<string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid</string>
<string name="keywords_model_and_hardware">serial number, hardware version</string>
<string name="keywords_android_version">android security patch level, baseband version, kernel version</string>
+ <!-- Search keyword for Ambient display settings screen. -->
+ <string name="keywords_ambient_display_screen">Ambient display, Lock screen display</string>
<!-- NFC Wi-Fi pairing/setup strings-->
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
index a8ded0d..8bd9bd6 100644
--- a/res/xml/ambient_display_settings.xml
+++ b/res/xml/ambient_display_settings.xml
@@ -17,7 +17,9 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="ambient_display_preference_screen"
+ settings:keywords="@string/keywords_ambient_display_screen"
android:title="@string/ambient_display_screen_title">
<PreferenceCategory