PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove LockdownButtonPreferenceController from java"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-20 00:16:43 +00:00
committed by Android (Google) Code Review
parent f9a768d6c3 e136bb550e
commit 2bc391bb09
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/security/LockdownButtonPreferenceController.java
View File

@@ -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);
}

2
src/com/android/settings/security/LockscreenDashboardFragment.java
View File

@@ -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;
}