Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable controllers to use a custom key.

Browse Source 
Test: atest SettingsUnitTests
Test: m -j45 RunSettingsRoboTests
Bug: 191763369
Change-Id: I48eea95613600580c80c8850f0a3fd543a7e0a43
This commit is contained in:
Jan Tomljanovic
2021-06-25 01:45:30 +01:00
parent 37b1831d0d
commit c6667337ca
18 changed files with 171 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -26,7 +26,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -74,6 +73,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
private RestrictedSwitchPreference mUnifyProfile;
private final String mPreferenceKey;
private LockscreenCredential mCurrentDevicePassword;
private LockscreenCredential mCurrentProfilePassword;
@@ -82,10 +82,15 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mUnifyProfile = screen.findPreference(KEY_UNIFICATION);
mUnifyProfile = screen.findPreference(mPreferenceKey);
}
public LockUnificationPreferenceController(Context context, SettingsPreferenceFragment host) {
this(context, host, KEY_UNIFICATION);
}
public LockUnificationPreferenceController(
Context context, SettingsPreferenceFragment host, String key) {
super(context);
mHost = host;
mUm = context.getSystemService(UserManager.class);
@@ -96,6 +101,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
mProfileUserId = Utils.getManagedProfileId(mUm, MY_USER_ID);
mCurrentDevicePassword = LockscreenCredential.createNone();
mCurrentProfilePassword = LockscreenCredential.createNone();
this.mPreferenceKey = key;
}
@Override
@@ -106,7 +112,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
@Override
public String getPreferenceKey() {
return KEY_UNIFICATION;
return mPreferenceKey;
}
@Override