Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fe71068 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Don't index the ChooseLockGeneric screen" into lmp-dev

parents 8e6edba5 644907a8

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -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-->

res/xml/security_settings_lockscreen.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

res/xml/security_settings_password.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

res/xml/security_settings_pattern.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

res/xml/security_settings_pin.xml

+2 −0
Original line number Diff line number Diff line
@@ -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