diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-08-23 01:07:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-23 01:07:03 +0000 |
| commit | 8fe710682ad3f5a5ac0ed1393f3d934bea122bc5 (patch) | |
| tree | d0fe086906c3da8eacf63e80aa8a8d113e83e004 /res | |
| parent | 8e6edba5606fd717a631aabcc4c5702bdd509033 (diff) | |
| parent | 644907a86f3d3ff726a003e0680b6c45f13dbfd0 (diff) | |
| download | packages_apps_Settings-8fe710682ad3f5a5ac0ed1393f3d934bea122bc5.zip packages_apps_Settings-8fe710682ad3f5a5ac0ed1393f3d934bea122bc5.tar.gz packages_apps_Settings-8fe710682ad3f5a5ac0ed1393f3d934bea122bc5.tar.bz2 | |
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/security_settings_lockscreen.xml | 2 | ||||
| -rw-r--r-- | res/xml/security_settings_password.xml | 2 | ||||
| -rw-r--r-- | res/xml/security_settings_pattern.xml | 2 | ||||
| -rw-r--r-- | res/xml/security_settings_pin.xml | 2 |
5 files changed, 11 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 86a3903..2debcdd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5564,7 +5564,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> @@ -5591,6 +5591,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 |