Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 4176d9fe01

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

Change-Id: I6c7b56ccdc4d0dab978c11b584345f5575fc0a10
This commit is contained in:
Matt Pietal
2021-06-22 17:02:41 +00:00
committed by Automerger Merge Worker

View File

@@ -45,6 +45,12 @@
android:title="@string/owner_info_settings_title" android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary" /> 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 <SwitchPreference
android:key="lockscreen_privacy_wallet_switch" android:key="lockscreen_privacy_wallet_switch"
android:title="@string/lockscreen_privacy_wallet_setting_toggle" android:title="@string/lockscreen_privacy_wallet_setting_toggle"