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

Move all the shared data from biometric controllers to separate utility classes

Browse Source 
Test: atest SettingsUnitTests

Bug: 215517420
Change-Id: Ic5421cd910ae77d4e7c0a29ae0337edb98a1d3b9
This commit is contained in:
Yuri Ufimtsev
2022-02-18 14:54:12 +00:00
parent 3b3c6bc564
commit 268d1d6dc6
16 changed files with 1175 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.biometrics.face;
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.face.FaceManager;
import androidx.annotation.Nullable;
@@ -28,11 +27,8 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricStatusPreferenceController;
import com.android.settings.biometrics.ParentalControlsUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
@@ -44,6 +40,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
protected final FaceManager mFaceManager;
@VisibleForTesting
RestrictedPreference mPreference;
private final FaceStatusUtils mFaceStatusUtils;
public FaceStatusPreferenceController(Context context) {
this(context, KEY_FACE_SETTINGS, null /* lifecycle */);
@@ -60,6 +57,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
public FaceStatusPreferenceController(Context context, String key, Lifecycle lifecycle) {
super(context, key);
mFaceManager = Utils.getFaceManagerOrNull(context);
mFaceStatusUtils = new FaceStatusUtils(context, mFaceManager);
if (lifecycle != null) {
lifecycle.addObserver(this);
@@ -79,12 +77,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
@Override
protected boolean isDeviceSupported() {
return !Utils.isMultipleBiometricsSupported(mContext) && Utils.hasFaceHardware(mContext);
}
@Override
protected boolean hasEnrolledBiometrics() {
return mFaceManager.hasEnrolledTemplates(getUserId());
return mFaceStatusUtils.isAvailable();
}
@Override
@@ -94,8 +87,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
}
private void updateStateInternal() {
updateStateInternal(ParentalControlsUtils.parentConsentRequired(
mContext, BiometricAuthenticator.TYPE_FACE));
updateStateInternal(mFaceStatusUtils.getDisablingAdmin());
}
@VisibleForTesting
@@ -106,25 +98,12 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
}
@Override
protected String getSummaryTextEnrolled() {
return mContext.getResources()
.getString(R.string.security_settings_face_preference_summary);
}
@Override
protected String getSummaryTextNoneEnrolled() {
return mContext.getResources()
.getString(R.string.security_settings_face_preference_summary_none);
protected String getSummaryText() {
return mFaceStatusUtils.getSummary();
}
@Override
protected String getSettingsClassName() {
return Settings.FaceSettingsActivity.class.getName();
return mFaceStatusUtils.getSettingsClassName();
}
@Override
protected String getEnrollClassName() {
return FaceEnrollIntroduction.class.getName();
}
}