From e136bb550e67c5449a1ef4ad6e26afe946508779 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 19 Apr 2018 15:12:42 -0700
Subject: [PATCH] Remove LockdownButtonPreferenceController from java

It's already registered in xml.

Change-Id: I9b363e0d7543fd8139b4e4e65e11d567cbf2ae70
Fixes: 78299993
Test: robotests
---
 .../security/LockdownButtonPreferenceController.java   |  8 ++------
 .../settings/security/LockscreenDashboardFragment.java |  2 --
 .../LockdownButtonPreferenceControllerTest.java        | 10 +++++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java
index 89605020b39..dd6e0d0f7c2 100644
--- a/src/com/android/settings/security/LockdownButtonPreferenceController.java
+++ b/src/com/android/settings/security/LockdownButtonPreferenceController.java
@@ -19,8 +19,6 @@ package com.android.settings.security;
 import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.TwoStatePreference;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.core.BasePreferenceController;
@@ -28,12 +26,10 @@ import com.android.settings.core.TogglePreferenceController;
 
 public class LockdownButtonPreferenceController extends TogglePreferenceController {
 
-    private static final String KEY_LOCKDOWN_ENALBED = "security_setting_lockdown_enabled";
-
     private final LockPatternUtils mLockPatternUtils;
 
-    public LockdownButtonPreferenceController(Context context) {
-        super(context, KEY_LOCKDOWN_ENALBED);
+    public LockdownButtonPreferenceController(Context context, String key) {
+        super(context, key);
         mLockPatternUtils = new LockPatternUtils(context);
     }
 
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 3cf5ba6c409..209eb0179b6 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -93,7 +93,6 @@ public class LockscreenDashboardFragment extends DashboardFragment
         mOwnerInfoPreferenceController =
                 new OwnerInfoPreferenceController(context, this, lifecycle);
         controllers.add(mOwnerInfoPreferenceController);
-        controllers.add(new LockdownButtonPreferenceController(context));
 
         return controllers;
     }
@@ -124,7 +123,6 @@ public class LockscreenDashboardFragment extends DashboardFragment
                             KEY_ADD_USER_FROM_LOCK_SCREEN, null /* lifecycle */));
                     controllers.add(new OwnerInfoPreferenceController(
                             context, null /* fragment */, null /* lifecycle */));
-                    controllers.add(new LockdownButtonPreferenceController(context));
                     return controllers;
                 }
 
diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
index 023324c1795..de44c4599be 100644
--- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
@@ -51,24 +51,24 @@ public class LockdownButtonPreferenceControllerTest {
         mContext = RuntimeEnvironment.application;
         mPreference = new SwitchPreference(mContext);
 
-        mController = spy(new LockdownButtonPreferenceController(mContext));
+        mController = spy(new LockdownButtonPreferenceController(mContext, "TestKey"));
         ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);
     }
 
     @Test
-    public void isAvailable_lockSet_shouldReturnTrue() throws Exception {
+    public void isAvailable_lockSet_shouldReturnTrue() {
         when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
-    public void isAvailable_lockUnset_shouldReturnFalse() throws Exception {
+    public void isAvailable_lockUnset_shouldReturnFalse() {
         when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void onPreferenceChange_settingIsUpdated() throws Exception {
+    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();
@@ -78,7 +78,7 @@ public class LockdownButtonPreferenceControllerTest {
     }
 
     @Test
-    public void onSettingChange_preferenceIsUpdated() throws Exception {
+    public void onSettingChange_preferenceIsUpdated() {
         boolean state = Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0;
         mController.updateState(mPreference);