Don't index the ChooseLockGeneric screen
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.
Instead, add some of the relevant keywords up one level in Security
settings.
Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2e19a1..dd3952a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5561,7 +5561,7 @@
<!-- Text used to identify the search results -->
<string name="search_results_label">Results</string>
- <!--Search Keywords [CHAR_LIMIT=NONE]-->
+ <!--Search Keywords [CHAR LIMIT=NONE]-->
<string name="keywords_wifi">wifi wi-fi network connection</string>
<string name="keywords_more_default_sms_app">text message</string>
<string name="keywords_more_mobile_networks">cellular cell carrier wireless</string>
@@ -5588,6 +5588,8 @@
<string name="keywords_accounts">account</string>
<string name="keywords_users">restriction restrict restricted</string>
<string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji</string>
+ <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+ <string name="keywords_lockscreen">slide password pattern pin</string>
<!-- NFC Wi-Fi pairing/setup strings-->
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index 6798c71..88df74b 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/security_settings_title">
<PreferenceCategory
@@ -25,6 +26,7 @@
android:key="unlock_set_or_change"
android:title="@string/unlock_set_unlock_launch_picker_title"
android:summary="@string/unlock_set_unlock_mode_off"
+ settings:keywords="@string/keywords_lockscreen"
android:persistent="false"/>
<PreferenceScreen
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index b6ea76e..9f1092a 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/lock_settings_picker_title">
<PreferenceCategory
@@ -25,6 +26,7 @@
android:key="unlock_set_or_change"
android:title="@string/unlock_set_unlock_launch_picker_title"
android:summary="@string/unlock_set_unlock_mode_password"
+ settings:keywords="@string/keywords_lockscreen"
android:persistent="false"/>
<ListPreference
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index cb848c6..ceb749c 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/lock_settings_picker_title">
<PreferenceCategory
@@ -25,6 +26,7 @@
android:key="unlock_set_or_change"
android:title="@string/unlock_set_unlock_launch_picker_title"
android:summary="@string/unlock_set_unlock_mode_pattern"
+ settings:keywords="@string/keywords_lockscreen"
android:persistent="false"/>
<SwitchPreference
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index e45bdf5..4470b1d 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/lock_settings_picker_title">
<PreferenceCategory
@@ -25,6 +26,7 @@
android:key="unlock_set_or_change"
android:title="@string/unlock_set_unlock_launch_picker_title"
android:summary="@string/unlock_set_unlock_mode_pin"
+ settings:keywords="@string/keywords_lockscreen"
android:persistent="false"/>
<ListPreference
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 5108da3..105ce7e 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -18,7 +18,6 @@
import android.provider.SearchIndexableResource;
-import com.android.settings.ChooseLockGeneric;
import com.android.settings.DataUsageSummary;
import com.android.settings.DateTimeSettings;
import com.android.settings.DevelopmentSettings;
@@ -201,14 +200,6 @@
SecuritySettings.class.getName(),
R.drawable.ic_settings_security));
- sResMap.put(ChooseLockGeneric.ChooseLockGenericFragment.class.getName(),
- new SearchIndexableResource(
- Ranking.getRankForClassName(
- ChooseLockGeneric.ChooseLockGenericFragment.class.getName()),
- R.xml.security_settings_picker,
- ChooseLockGeneric.ChooseLockGenericFragment.class.getName(),
- R.drawable.ic_settings_security));
-
sResMap.put(ScreenPinningSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(ScreenPinningSettings.class.getName()),