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

Commit 8d9fe53e authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Make sure biometric icon ends in authenticated state 

Bug: 129501166

Test: Manual
Change-Id: I8cef5f6b60e463906b54dd152f880219b68ae038
parent d8913d7e

packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public abstract class BiometricDialogView extends LinearLayout { 
    protected void updateIcon(int lastState, int newState) {

        final Drawable icon = getAnimationForTransition(lastState, newState);

        if (icon == null) {

            Log.e(TAG, "Animation not found");

            Log.e(TAG, "Animation not found, " + lastState + " -> " + newState);

            return;

        }

packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java

+8 −0
Original line number Diff line number Diff line
@@ -330,6 +330,10 @@ public class FaceDialogView extends BiometricDialogView { 
            return true;

        } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) {

            return true;

        } else if (oldState == STATE_ERROR && newState == STATE_PENDING_CONFIRMATION) {

            return true;

        } else if (oldState == STATE_ERROR && newState == STATE_AUTHENTICATED) {

            return true;

        }

        return false;

    }
@@ -364,6 +368,10 @@ public class FaceDialogView extends BiometricDialogView { 
            iconRes = R.drawable.face_dialog_face_blue_to_checkmark;

        } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) {

            iconRes = R.drawable.face_dialog_face_gray_to_checkmark;

        } else if (oldState == STATE_ERROR && newState == STATE_PENDING_CONFIRMATION) {

            iconRes = R.drawable.face_dialog_face_gray_to_face_blue;

        } else if (oldState == STATE_ERROR && newState == STATE_AUTHENTICATED) {

            iconRes = R.drawable.face_dialog_face_blue_to_checkmark;

        } else {

            return null;

        }

packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ public class FingerprintDialogView extends BiometricDialogView { 
        } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) {

            // TODO(b/77328470): add animation when fingerprint is authenticated

            return false;

        } else if (oldState == STATE_ERROR && newState == STATE_AUTHENTICATED) {

            // TODO(b/77328470): add animation when fingerprint is authenticated

            return false;

        }

        return false;

    }
@@ -93,6 +96,9 @@ public class FingerprintDialogView extends BiometricDialogView { 
        } else if (oldState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) {

            // TODO(b/77328470): add animation when fingerprint is authenticated

            iconRes = R.drawable.fingerprint_dialog_fp_to_error;

        } else if (oldState == STATE_ERROR && newState == STATE_AUTHENTICATED) {

            // TODO(b/77328470): add animation when fingerprint is authenticated

            iconRes = R.drawable.fingerprint_dialog_fp_to_error;

        } else {

            return null;

        }