Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76d40d3e authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update Settings to match Framework 

Bug: 72825012
Test: atest SettingsRoboTests

Change-Id: Ie59347bcb5d6748b3e684541b390c8e5f6db3f4a
parent 28d1b223

src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon 


    @Override

    protected boolean hasEnrolledBiometrics() {

        return mFaceManager.hasEnrolledFaces(mUserId);

        return mFaceManager.hasEnrolledTemplates(mUserId);

    }



    @Override

src/com/android/settings/password/ChooseLockGeneric.java

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
        // TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness

        private void removeAllFaceForUserAndFinish(final int userId, RemovalTracker tracker) {

            if (mFaceManager != null && mFaceManager.isHardwareDetected()) {

                if (mFaceManager.hasEnrolledFaces(userId)) {

                if (mFaceManager.hasEnrolledTemplates(userId)) {

                    mFaceManager.setActiveUser(userId);

                    Face face = new Face(null, 0, 0);

                    mFaceManager.remove(face, userId,

src/com/android/settings/password/SetNewPasswordController.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ final class SetNewPasswordController { 
        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)

                && mFaceManager != null

                && mFaceManager.isHardwareDetected()

                && !mFaceManager.hasEnrolledFaces(mTargetUserId)

                && !mFaceManager.hasEnrolledTemplates(mTargetUserId)

                && !isFaceDisabledByAdmin()) {

            extras = getFaceChooseLockExtras();

        } else if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)

tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class FaceStatusPreferenceControllerTest { 
        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        when(mFaceManager.getEnrolledFaces(anyInt()))

                .thenReturn(Collections.singletonList(mock(Face.class)));

        when(mFaceManager.hasEnrolledFaces(anyInt()))

        when(mFaceManager.hasEnrolledTemplates(anyInt()))

                .thenReturn(true);



        mController.updateState(mPreference);

tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device supports face.

        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        // GIVEN there are no enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);

        // GIVEN DPC does not disallow face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(0);
@@ -177,7 +177,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device does NOT support face.

        when(mFaceManager.isHardwareDetected()).thenReturn(false);

        // GIVEN there are no enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);

        // GIVEN DPC does not disallow face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(0);
@@ -215,7 +215,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device supports face.

        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        // GIVEN there are no enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);

        // GIVEN DPC does not disallow face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(0);
@@ -253,7 +253,7 @@ public final class SetNewPasswordControllerTest { 
        // GIVEN the device supports face.

        when(mFaceManager.isHardwareDetected()).thenReturn(true);

        // GIVEN there is an enrolled face.

        when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);

        when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);

        // GIVEN DPC disallows face for keyguard usage.

        when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))

                .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);