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

Commit d197608e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #14323097 Launching Security from Settings search results... 

Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
parents 6207391a 1d5b910f

res/xml/security_settings_biometric_weak.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="security_category"

res/xml/security_settings_chooser.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="security_category"

res/xml/security_settings_encrypted.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="security_category"

res/xml/security_settings_lockscreen.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="security_category"

res/xml/security_settings_misc.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  android:title="@string/security_settings_title">



    <PreferenceCategory android:key="sim_lock"

            android:title="@string/sim_lock_settings_title"