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

Commit 3ae1519d authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Restore lockdown setting" into sc-dev am: c07d6ba8 am: 4176d9fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I6c7b56ccdc4d0dab978c11b584345f5575fc0a10
parents 8b070042 4176d9fe

res/xml/security_lockscreen_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ 
            android:title="@string/owner_info_settings_title"

            android:summary="@string/owner_info_settings_summary" />



        <SwitchPreference

            android:key="security_setting_lockdown_enabled"

            android:title="@string/lockdown_settings_title"

            android:summary="@string/lockdown_settings_summary"

            settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />



        <SwitchPreference

            android:key="lockscreen_privacy_wallet_switch"

            android:title="@string/lockscreen_privacy_wallet_setting_toggle"