diff --git a/res/values/strings.xml b/res/values/strings.xml
index b5f1c5ce21b..ddfc6ff5e75 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -646,10 +646,6 @@
Enable widgets
Disabled by admin
-
- Show lockdown option
-
- Display Power button option that turns off Smart Lock, Face Unlock, Fingerprint Unlock, and notifications on the lock screen
Lock screen when trust is lost
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 0e802f665f5..82cb8609114 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -45,12 +45,6 @@
android:title="@string/owner_info_settings_title"
android:summary="@string/owner_info_settings_summary" />
-
-
-
-
\ No newline at end of file
diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java
deleted file mode 100644
index 5b29868f06d..00000000000
--- a/src/com/android/settings/security/LockdownButtonPreferenceController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.TogglePreferenceController;
-
-public class LockdownButtonPreferenceController extends TogglePreferenceController {
-
- private final LockPatternUtils mLockPatternUtils;
-
- public LockdownButtonPreferenceController(Context context, String key) {
- super(context, key);
- mLockPatternUtils = new LockPatternUtils(context);
- }
-
- @Override
- public int getAvailabilityStatus() {
- if (mLockPatternUtils.isSecure(UserHandle.myUserId())) {
- return AVAILABLE;
- } else {
- return DISABLED_FOR_USER;
- }
- }
-
- @Override
- public boolean isChecked() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
- }
-
- @Override
- public boolean setChecked(boolean isChecked) {
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.LOCKDOWN_IN_POWER_MENU, isChecked ? 1 : 0);
- return true;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
deleted file mode 100644
index 5b6b3464b4c..00000000000
--- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.security;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.widget.LockPatternUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(RobolectricTestRunner.class)
-public class LockdownButtonPreferenceControllerTest {
-
- @Mock
- private LockPatternUtils mLockPatternUtils;
- private SwitchPreference mPreference;
-
- private Context mContext;
- private LockdownButtonPreferenceController mController;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mPreference = new SwitchPreference(mContext);
-
- mController = spy(new LockdownButtonPreferenceController(mContext, "TestKey"));
- ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);
- }
-
- @Test
- public void isAvailable_lockSet_shouldReturnTrue() {
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void isAvailable_lockUnset_shouldReturnFalse() {
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void onPreferenceChange_settingIsUpdated() {
- boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
- assertThat(mController.onPreferenceChange(mPreference, !state)).isTrue();
- boolean newState = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
- assertThat(newState).isEqualTo(!state);
- }
-
- @Test
- public void onSettingChange_preferenceIsUpdated() {
- boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
- mController.updateState(mPreference);
- assertThat(mPreference.isChecked()).isEqualTo(state);
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.LOCKDOWN_IN_POWER_MENU, state ? 0 : 1);
-
- mController.updateState(mPreference);
- assertThat(mPreference.isChecked()).isEqualTo(!state);
- }
-}