Add synonym for "Display over other apps"
Add "draw" to the search keyword list as this item was renamed from
"Draw over other apps".
Bug: 135665821
Test: robotests and search keyword draw
Change-Id: Ifdb35d021f5efa15ebc754ff18734c806e643c5e
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3b22e11..55b228b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7307,7 +7307,7 @@
<!-- Search keyword for "Time zone" settings [CHAR_LIMIT=NONE]-->
<string name="keywords_time_zone">timezone</string>
<!-- Search keyword for "Display over other apps" settings [CHAR_LIMIT=NONE]-->
- <string name="keywords_draw_overlay">Chat head</string>
+ <string name="keywords_draw_overlay">Chat head, system, alert, window, dialog, display, on top other apps, draw</string>
<!-- Search keyword for "Flashlight" settings [CHAR_LIMIT=NONE]-->
<string name="keywords_flashlight">Flashlight, Light, Torch</string>
@@ -9388,8 +9388,6 @@
<!-- Keyword for VR setting -->
<string name="keywords_vr_listener">vr virtual reality listener stereo helper service</string>
- <!-- Keyword for SYSTEM_ALERT_WINDOW -->
- <string name="keywords_system_alert_window">system alert window dialog display on top other apps</string>
<!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
<string name="overlay_settings">Display over other apps</string>
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index f846298..e07ede7 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -42,7 +42,7 @@
android:key="system_alert_window"
android:title="@string/system_alert_window_settings"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
- settings:keywords="@string/keywords_system_alert_window"
+ settings:keywords="@string/keywords_draw_overlay"
settings:controller="com.android.settings.applications.specialaccess.SystemAlertWindowPreferenceController">
<extra
android:name="classname"
diff --git a/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java b/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java
index 5d9e8b6..5c2b009 100644
--- a/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java
@@ -31,6 +31,6 @@
@Override
public int getAvailabilityStatus() {
return isSystemAlertWindowEnabled(mContext)
- ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE ;
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE ;
}
}