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

Commit 4ffa5c8a authored by Oleksandr Peletskyi's avatar Oleksandr Peletskyi Committed by Android (Google) Code Review
Browse files

Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev

parents e5b8ec02 7aeb56ce

res/xml/security_settings_lockscreen.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:key="security_category"

        android:title="@string/lock_settings_title">



        <PreferenceScreen

        <com.android.settingslib.RestrictedPreference

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_off"

res/xml/security_settings_lockscreen_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

                  android:title="@string/security_settings_title">



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

        android:key="unlock_set_or_change_profile"

        android:title="@string/unlock_set_unlock_launch_picker_title_profile"

        android:summary="@string/unlock_set_unlock_mode_off"

res/xml/security_settings_password_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

                  android:title="@string/security_settings_title">



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

        android:key="unlock_set_or_change_profile"

        android:title="@string/unlock_set_unlock_launch_picker_title_profile"

        android:summary="@string/unlock_set_unlock_mode_password"

res/xml/security_settings_pattern_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

                  android:title="@string/security_settings_title">



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

        android:key="unlock_set_or_change_profile"

        android:title="@string/unlock_set_unlock_launch_picker_title_profile"

        android:summary="@string/unlock_set_unlock_mode_pattern"

res/xml/security_settings_pin_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

                  android:title="@string/security_settings_title">



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

        android:key="unlock_set_or_change_profile"

        android:title="@string/unlock_set_unlock_launch_picker_title_profile"

        android:summary="@string/unlock_set_unlock_mode_pin"