Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: 97b8a6409d

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

Change-Id: I0770404823036e30f4e38cf8ff298b90d78e34a6
This commit is contained in:
Beth Thibodeau
2021-07-15 23:10:52 +00:00
committed by Automerger Merge Worker
5 changed files with 0 additions and 166 deletions

View File

@@ -45,12 +45,6 @@
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"

View File

@@ -60,10 +60,4 @@
</PreferenceCategory>
<SwitchPreference
android:key="biometric_setting_lockdown_enabled"
android:title="@string/lockdown_settings_title"
android:summary="@string/lockdown_settings_summary"
settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />
</PreferenceScreen>