Merge "Remove AuthDialog and AuthDialogCallback Reasons" into main

6 files changed, 51 insertions, 258 deletions

diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt
index 50762edc1179..88c9e74551fd 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt
@@ -21,6 +21,7 @@ import android.content.res.Configuration
 import android.hardware.biometrics.BiometricAuthenticator
 import android.hardware.biometrics.BiometricConstants
 import android.hardware.biometrics.BiometricManager
+import android.hardware.biometrics.BiometricPrompt
 import android.hardware.biometrics.PromptContentViewWithMoreOptionsButton
 import android.hardware.biometrics.PromptInfo
 import android.hardware.biometrics.PromptVerticalListContentView
@@ -290,7 +291,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
 
         verify(callback)
             .onDismissed(
-                eq(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED),
+                eq(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED),
                 eq<ByteArray?>(null), /* credentialAttestation */
                 eq(authContainer?.requestId ?: 0L),
             )
@@ -310,7 +311,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
             )
         verify(callback)
             .onDismissed(
-                eq(AuthDialogCallback.DISMISSED_USER_CANCELED),
+                eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL),
                 eq<ByteArray?>(null), /* credentialAttestation */
                 eq(authContainer?.requestId ?: 0L),
             )
@@ -325,7 +326,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
 
         verify(callback)
             .onDismissed(
-                eq(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE),
+                eq(BiometricPrompt.DISMISSED_REASON_NEGATIVE),
                 eq<ByteArray?>(null), /* credentialAttestation */
                 eq(authContainer?.requestId ?: 0L),
             )
@@ -352,7 +353,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
 
         verify(callback)
             .onDismissed(
-                eq(AuthDialogCallback.DISMISSED_ERROR),
+                eq(BiometricPrompt.DISMISSED_REASON_ERROR),
                 eq<ByteArray?>(null), /* credentialAttestation */
                 eq(authContainer?.requestId ?: 0L),
             )
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java
index acc97a9f8642..a1a2aa70d869 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java
@@ -138,9 +138,9 @@ public class AuthControllerTest extends SysuiTestCase {
     @Mock
     private IBiometricContextListener mContextListener;
     @Mock
-    private AuthDialog mDialog1;
+    private AuthContainerView mDialog1;
     @Mock
-    private AuthDialog mDialog2;
+    private AuthContainerView mDialog2;
     @Mock
     private CommandQueue mCommandQueue;
     @Mock
@@ -382,7 +382,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonUserCanceled_whenDismissedByUserCancel() throws Exception {
         showDialog(new int[]{1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -393,7 +393,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonNegative_whenDismissedByButtonNegative() throws Exception {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_NEGATIVE,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -404,7 +404,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonConfirmed_whenDismissedByButtonPositive() throws Exception {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -415,7 +415,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonConfirmNotRequired_whenDismissedByAuthenticated() throws Exception {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -426,7 +426,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonError_whenDismissedByError() throws Exception {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_ERROR,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_ERROR,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -437,7 +437,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonServerRequested_whenDismissedByServer() throws Exception {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -452,7 +452,7 @@ public class AuthControllerTest extends SysuiTestCase {
 
         final byte[] credentialAttestation = generateRandomHAT();
 
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED,
                 credentialAttestation, mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
                 eq(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED),
@@ -462,7 +462,7 @@ public class AuthControllerTest extends SysuiTestCase {
     @Test
     public void testSendsReasonContentViewMoreOptions_whenButtonPressed() throws Exception {
         showDialog(new int[]{1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS,
                 null, /* credentialAttestation */
                 mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
@@ -696,7 +696,7 @@ public class AuthControllerTest extends SysuiTestCase {
 
         final byte[] credentialAttestation = generateRandomHAT();
 
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED,
                 credentialAttestation, mAuthController.mCurrentDialog.getRequestId());
         verify(mReceiver).onDialogDismissed(
                 eq(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED),
@@ -755,7 +755,7 @@ public class AuthControllerTest extends SysuiTestCase {
     public void testDoesNotCrash_whenTryAgainPressedAfterDismissal() {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
         final long requestID = mAuthController.mCurrentDialog.getRequestId();
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
                 null, /* credentialAttestation */requestID);
         mAuthController.onTryAgainPressed(requestID);
     }
@@ -764,7 +764,7 @@ public class AuthControllerTest extends SysuiTestCase {
     public void testDoesNotCrash_whenDeviceCredentialPressedAfterDismissal() {
         showDialog(new int[] {1} /* sensorIds */, false /* credentialAllowed */);
         final long requestID = mAuthController.mCurrentDialog.getRequestId();
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
                 null /* credentialAttestation */, requestID);
         mAuthController.onDeviceCredentialPressed(requestID);
     }
@@ -818,7 +818,7 @@ public class AuthControllerTest extends SysuiTestCase {
 
         // WHEN dialog is shown and then dismissed
         showDialog(new int[]{1} /* sensorIds */, false /* credentialAllowed */);
-        mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
+        mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
                 null /* credentialAttestation */,
                 mAuthController.mCurrentDialog.getRequestId());
 
@@ -1218,14 +1218,14 @@ public class AuthControllerTest extends SysuiTestCase {
         }
 
         @Override
-        protected AuthDialog buildDialog(DelayableExecutor bgExecutor, PromptInfo promptInfo,
+        protected AuthContainerView buildDialog(DelayableExecutor bgExecutor, PromptInfo promptInfo,
                 boolean requireConfirmation, int userId, int[] sensorIds,
                 String opPackageName, boolean skipIntro, long operationId, long requestId,
                 WakefulnessLifecycle wakefulnessLifecycle,
                 UserManager userManager,
                 LockPatternUtils lockPatternUtils, PromptViewModel viewModel) {
 
-            AuthDialog dialog;
+            AuthContainerView dialog;
             if (mBuildCount == 0) {
                 dialog = mDialog1;
             } else if (mBuildCount == 1) {
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
index b6537118324e..4c8a8f1c13d7 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
@@ -33,6 +33,7 @@ import android.graphics.PixelFormat;
 import android.hardware.biometrics.BiometricAuthenticator.Modality;
 import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.BiometricManager.Authenticators;
+import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.PromptInfo;
 import android.hardware.face.FaceSensorPropertiesInternal;
 import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
@@ -100,7 +101,7 @@ import javax.inject.Provider;
  */
 @Deprecated
 public class AuthContainerView extends LinearLayout
-        implements AuthDialog, WakefulnessLifecycle.Observer, CredentialView.Host {
+        implements WakefulnessLifecycle.Observer, CredentialView.Host {
 
     private static final String TAG = "AuthContainerView";
 
@@ -158,12 +159,11 @@ public class AuthContainerView extends LinearLayout
     private final Set<Integer> mFailedModalities = new HashSet<Integer>();
     private final OnBackInvokedCallback mBackCallback = this::onBackInvoked;
 
-    private final @Background DelayableExecutor mBackgroundExecutor;
 
     private final MSDLPlayer mMSDLPlayer;
 
     // Non-null only if the dialog is in the act of dismissing and has not sent the reason yet.
-    @Nullable @AuthDialogCallback.DismissedReason private Integer mPendingCallbackReason;
+    @Nullable @BiometricPrompt.DismissedReason private Integer mPendingCallbackReason;
     // HAT received from LockSettingsService when credential is verified.
     @Nullable private byte[] mCredentialAttestation;
 
@@ -188,18 +188,18 @@ public class AuthContainerView extends LinearLayout
     final class BiometricCallback implements Spaghetti.Callback {
         @Override
         public void onAuthenticated() {
-            animateAway(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED);
+            animateAway(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED);
         }
 
         @Override
         public void onUserCanceled() {
             sendEarlyUserCanceled();
-            animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
+            animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
         }
 
         @Override
         public void onButtonNegative() {
-            animateAway(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE);
+            animateAway(BiometricPrompt.DISMISSED_REASON_NEGATIVE);
         }
 
         @Override
@@ -210,12 +210,12 @@ public class AuthContainerView extends LinearLayout
 
         @Override
         public void onContentViewMoreOptionsButtonPressed() {
-            animateAway(AuthDialogCallback.DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS);
+            animateAway(BiometricPrompt.DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS);
         }
 
         @Override
         public void onError() {
-            animateAway(AuthDialogCallback.DISMISSED_ERROR);
+            animateAway(BiometricPrompt.DISMISSED_REASON_ERROR);
         }
 
         @Override
@@ -234,20 +234,20 @@ public class AuthContainerView extends LinearLayout
 
         @Override
         public void onAuthenticatedAndConfirmed() {
-            animateAway(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE);
+            animateAway(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED);
         }
     }
 
     @Override
     public void onCredentialMatched(@NonNull byte[] attestation) {
         mCredentialAttestation = attestation;
-        animateAway(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED);
+        animateAway(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED);
     }
 
     @Override
     public void onCredentialAborted() {
         sendEarlyUserCanceled();
-        animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
+        animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
     }
 
     @Override
@@ -277,7 +277,7 @@ public class AuthContainerView extends LinearLayout
                         com.android.settingslib.R.string.failed_attempts_now_wiping_dialog_dismiss,
                         null /* OnClickListener */)
                 .setOnDismissListener(
-                        dialog -> animateAway(AuthDialogCallback.DISMISSED_ERROR))
+                        dialog -> animateAway(BiometricPrompt.DISMISSED_REASON_ERROR))
                 .create();
         alertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
         alertDialog.show();
@@ -349,7 +349,6 @@ public class AuthContainerView extends LinearLayout
 
         mPanelView = mLayout.findViewById(R.id.panel);
         mPanelController = new AuthPanelController(mContext, mPanelView);
-        mBackgroundExecutor = bgExecutor;
         mInteractionJankMonitor = jankMonitor;
         mCredentialViewModelProvider = credentialViewModelProvider;
 
@@ -394,7 +393,7 @@ public class AuthContainerView extends LinearLayout
     @VisibleForTesting
     public void onBackInvoked() {
         sendEarlyUserCanceled();
-        animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
+        animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
     }
 
     void sendEarlyUserCanceled() {
@@ -402,7 +401,6 @@ public class AuthContainerView extends LinearLayout
                 BiometricConstants.BIOMETRIC_SYSTEM_EVENT_EARLY_USER_CANCEL, getRequestId());
     }
 
-    @Override
     public boolean isAllowDeviceCredentials() {
         return Utils.isDeviceCredentialAllowed(mConfig.mPromptInfo);
     }
@@ -450,7 +448,6 @@ public class AuthContainerView extends LinearLayout
         mPanelController.setContainerDimensions(getMeasuredWidth(), getMeasuredHeight());
     }
 
-    @Override
     public void onOrientationChanged() {
     }
 
@@ -538,10 +535,9 @@ public class AuthContainerView extends LinearLayout
 
     @Override
     public void onStartedGoingToSleep() {
-        animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
+        animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
     }
 
-    @Override
     public void show(WindowManager wm) {
         wm.addView(this, getLayoutParams(mWindowToken, mConfig.mPromptInfo.getTitle()));
     }
@@ -559,7 +555,6 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public void dismissWithoutCallback(boolean animate) {
         if (animate) {
             animateAway(false /* sendReason */, 0 /* reason */);
@@ -569,12 +564,10 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public void dismissFromSystemServer() {
         animateAway(false /* sendReason */, 0 /* reason */);
     }
 
-    @Override
     public void onAuthenticationSucceeded(@Modality int modality) {
         if (mBiometricView != null) {
             mBiometricView.onAuthenticationSucceeded(modality);
@@ -583,7 +576,6 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public void onAuthenticationFailed(@Modality int modality, String failureReason) {
         if (mBiometricView != null) {
             mFailedModalities.add(modality);
@@ -593,7 +585,6 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public void onHelp(@Modality int modality, String help) {
         if (mBiometricView != null) {
             mBiometricView.onHelp(modality, help);
@@ -602,7 +593,6 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public void onError(@Modality int modality, String error) {
         if (mBiometricView != null) {
             mBiometricView.onError(modality, error);
@@ -611,7 +601,6 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public void onPointerDown() {
         if (mBiometricView != null) {
             if (mFailedModalities.contains(TYPE_FACE)) {
@@ -624,22 +613,18 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public String getOpPackageName() {
         return mConfig.mOpPackageName;
     }
 
-    @Override
     public String getClassNameIfItIsConfirmDeviceCredentialActivity() {
         return  mConfig.mPromptInfo.getClassNameIfItIsConfirmDeviceCredentialActivity();
     }
 
-    @Override
     public long getRequestId() {
         return mConfig.mRequestId;
     }
 
-    @Override
     public void animateToCredentialUI(boolean isError) {
         if (mBiometricView != null) {
             mBiometricView.startTransitionToCredentialUI(isError);
@@ -648,11 +633,11 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    void animateAway(@AuthDialogCallback.DismissedReason int reason) {
+    void animateAway(@BiometricPrompt.DismissedReason int reason) {
         animateAway(true /* sendReason */, reason);
     }
 
-    private void animateAway(boolean sendReason, @AuthDialogCallback.DismissedReason int reason) {
+    private void animateAway(boolean sendReason, @BiometricPrompt.DismissedReason int reason) {
         if (mContainerState == STATE_ANIMATING_IN) {
             Log.w(TAG, "startDismiss(): waiting for onDialogAnimatedIn");
             mContainerState = STATE_PENDING_DISMISS;
@@ -732,7 +717,7 @@ public class AuthContainerView extends LinearLayout
     private void onDialogAnimatedIn() {
         if (mContainerState == STATE_PENDING_DISMISS) {
             Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now");
-            animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
+            animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
             return;
         }
         if (mContainerState == STATE_ANIMATING_OUT || mContainerState == STATE_GONE) {
@@ -748,7 +733,6 @@ public class AuthContainerView extends LinearLayout
         }
     }
 
-    @Override
     public PromptViewModel getViewModel() {
         return mPromptViewModel;
     }
@@ -776,7 +760,6 @@ public class AuthContainerView extends LinearLayout
         return lp;
     }
 
-    @Override
     public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
         pw.println("    isAttachedToWindow=" + isAttachedToWindow());
         pw.println("    containerState=" + mContainerState);
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
index eee5f9e34317..68a282018ba4 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
@@ -163,7 +163,7 @@ public class AuthController implements
     // TODO: These should just be saved from onSaveState
     private SomeArgs mCurrentDialogArgs;
     @VisibleForTesting
-    AuthDialog mCurrentDialog;
+    AuthContainerView mCurrentDialog;
 
     @NonNull private final WindowManager mWindowManager;
     @NonNull private final DisplayManager mDisplayManager;
@@ -222,7 +222,7 @@ public class AuthController implements
         closeDialog(BiometricPrompt.DISMISSED_REASON_USER_CANCEL, reasonString);
     }
 
-    private void closeDialog(@DismissedReason int reason, String reasonString) {
+    private void closeDialog(@BiometricPrompt.DismissedReason int reason, String reasonString) {
         if (isShowing()) {
             Log.i(TAG, "Close BP, reason :" + reasonString);
             mCurrentDialog.dismissWithoutCallback(true /* animate */);
@@ -511,60 +511,14 @@ public class AuthController implements
     }
 
     @Override
-    public void onDismissed(@DismissedReason int reason,
-                            @Nullable byte[] credentialAttestation, long requestId) {
-
+    public void onDismissed(@BiometricPrompt.DismissedReason int reason,
+            @Nullable byte[] credentialAttestation, long requestId) {
         if (mCurrentDialog != null && requestId != mCurrentDialog.getRequestId()) {
             Log.w(TAG, "requestId doesn't match, skip onDismissed");
             return;
         }
 
-        switch (reason) {
-            case AuthDialogCallback.DISMISSED_USER_CANCELED:
-                sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE:
-                sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_NEGATIVE,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_BUTTON_POSITIVE:
-                sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED:
-                sendResultAndCleanUp(
-                        BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_ERROR:
-                sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_ERROR,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER:
-                sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED:
-                sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED,
-                        credentialAttestation);
-                break;
-
-            case AuthDialogCallback.DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS:
-                sendResultAndCleanUp(
-                        BiometricPrompt.DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS,
-                        credentialAttestation);
-                break;
-            default:
-                Log.e(TAG, "Unhandled reason: " + reason);
-                break;
-        }
+        sendResultAndCleanUp(reason, credentialAttestation);
     }
 
     @Override
@@ -699,7 +653,7 @@ public class AuthController implements
         mUdfpsController.onAodInterrupt(screenX, screenY, major, minor);
     }
 
-    private void sendResultAndCleanUp(@DismissedReason int reason,
+    private void sendResultAndCleanUp(@BiometricPrompt.DismissedReason int reason,
             @Nullable byte[] credentialAttestation) {
         if (mReceiver == null) {
             Log.e(TAG, "sendResultAndCleanUp: Receiver is null");
@@ -1244,7 +1198,7 @@ public class AuthController implements
         final long requestId = args.argl2;
 
         // Create a new dialog but do not replace the current one yet.
-        final AuthDialog newDialog = buildDialog(
+        final AuthContainerView newDialog = buildDialog(
                 mBackgroundExecutor,
                 promptInfo,
                 requireConfirmation,
@@ -1327,7 +1281,7 @@ public class AuthController implements
         return mContext.createDisplayContext(display).getSystemService(WindowManager.class);
     }
 
-    private void onDialogDismissed(@DismissedReason int reason) {
+    private void onDialogDismissed(@BiometricPrompt.DismissedReason int reason) {
         if (DEBUG) Log.d(TAG, "onDialogDismissed: " + reason);
         if (mCurrentDialog == null) {
             Log.w(TAG, "Dialog already dismissed");
@@ -1361,7 +1315,7 @@ public class AuthController implements
         }
     }
 
-    protected AuthDialog buildDialog(@Background DelayableExecutor bgExecutor,
+    protected AuthContainerView buildDialog(@Background DelayableExecutor bgExecutor,
             PromptInfo promptInfo, boolean requireConfirmation, int userId, int[] sensorIds,
             String opPackageName, boolean skipIntro, long operationId, long requestId,
             @NonNull WakefulnessLifecycle wakefulnessLifecycle,
@@ -1389,7 +1343,7 @@ public class AuthController implements
 
     @Override
     public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
-        final AuthDialog dialog = mCurrentDialog;
+        final AuthContainerView dialog = mCurrentDialog;
         pw.println("  mCachedDisplayInfo=" + mCachedDisplayInfo);
         pw.println("  mScaleFactor=" + mScaleFactor);
         pw.println("  fingerprintSensorLocationInNaturalOrientation="
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java
deleted file mode 100644
index 861191671ba9..000000000000
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.biometrics;
-
-import android.hardware.biometrics.BiometricAuthenticator.Modality;
-import android.view.WindowManager;
-
-import com.android.systemui.Dumpable;
-import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel;
-
-/**
- * Interface for the biometric dialog UI.
- *
- * TODO(b/287311775): remove along with legacy controller once flag is removed
- */
-@Deprecated
-public interface AuthDialog extends Dumpable {
-
-    /**
-     * Parameters used when laying out {@link AuthBiometricView}, its subclasses, and
-     * {@link AuthPanelController}.
-     */
-    class LayoutParams {
-        public final int mMediumHeight;
-        public final int mMediumWidth;
-
-        public LayoutParams(int mediumWidth, int mediumHeight) {
-            mMediumWidth = mediumWidth;
-            mMediumHeight = mediumHeight;
-        }
-    }
-
-    /**
-     * Show the dialog.
-     * @param wm
-     */
-    void show(WindowManager wm);
-
-    /**
-     * Dismiss the dialog without sending a callback.
-     */
-    void dismissWithoutCallback(boolean animate);
-
-    /**
-     * Dismiss the dialog. Animate away.
-     */
-    void dismissFromSystemServer();
-
-    /**
-     * Biometric authenticated. May be pending user confirmation, or completed.
-     */
-    void onAuthenticationSucceeded(@Modality int modality);
-
-    /**
-     * Authentication failed (reject, timeout). Dialog stays showing.
-     * @param modality sensor modality that triggered the error
-     * @param failureReason message
-     */
-    void onAuthenticationFailed(@Modality int modality, String failureReason);
-
-    /**
-     * Authentication rejected, or help message received.
-     * @param modality sensor modality that triggered the help message
-     * @param help message
-     */
-    void onHelp(@Modality int modality, String help);
-
-    /**
-     * Authentication failed. Dialog going away.
-     * @param modality sensor modality that triggered the error
-     * @param error message
-     */
-    void onError(@Modality int modality, String error);
-
-    /** UDFPS pointer down event. */
-    void onPointerDown();
-
-    /**
-     * Get the client's package name
-     */
-    String getOpPackageName();
-
-    /**
-     * Get the class name of ConfirmDeviceCredentialActivity. Returns null if the direct caller is
-     * not ConfirmDeviceCredentialActivity.
-     */
-    String getClassNameIfItIsConfirmDeviceCredentialActivity();
-
-    /** The requestId of the underlying operation within the framework. */
-    long getRequestId();
-
-    /**
-     * Animate to credential UI. Typically called after biometric is locked out.
-     */
-    void animateToCredentialUI(boolean isError);
-
-    /**
-     * @return true if device credential is allowed.
-     */
-    boolean isAllowDeviceCredentials();
-
-    /**
-     * Called when the device's orientation changed and the dialog may need to do another
-     * layout. This is most relevant to UDFPS since configuration changes are not sent by
-     * the framework in equivalent cases (landscape to reverse landscape) but the dialog
-     * must remain fixed on the physical sensor location.
-     */
-    void onOrientationChanged();
-
-    PromptViewModel getViewModel();
-}
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java
index 024c6eaa75bb..31c63d3c57e0 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java
@@ -16,40 +16,20 @@
 
 package com.android.systemui.biometrics;
 
-import android.annotation.IntDef;
 import android.annotation.Nullable;
+import android.hardware.biometrics.BiometricPrompt;
 
 /**
  * Callback interface for dialog views. These should be implemented by the controller (e.g.
  * FingerprintDialogImpl) and passed into their views (e.g. FingerprintDialogView).
  */
 public interface AuthDialogCallback {
-
-    int DISMISSED_USER_CANCELED = 1;
-    int DISMISSED_BUTTON_NEGATIVE = 2;
-    int DISMISSED_BUTTON_POSITIVE = 3;
-    int DISMISSED_BIOMETRIC_AUTHENTICATED = 4;
-    int DISMISSED_ERROR = 5;
-    int DISMISSED_BY_SYSTEM_SERVER = 6;
-    int DISMISSED_CREDENTIAL_AUTHENTICATED = 7;
-    int DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS = 8;
-
-    @IntDef({DISMISSED_USER_CANCELED,
-            DISMISSED_BUTTON_NEGATIVE,
-            DISMISSED_BUTTON_POSITIVE,
-            DISMISSED_BIOMETRIC_AUTHENTICATED,
-            DISMISSED_ERROR,
-            DISMISSED_BY_SYSTEM_SERVER,
-            DISMISSED_CREDENTIAL_AUTHENTICATED,
-            DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS})
-    @interface DismissedReason {}
-
     /**
      * Invoked when the dialog is dismissed
-     * @param reason
+     * @param reason - the {@link BiometricPrompt.DismissedReason} for dismissing
      * @param credentialAttestation the HAT received from LockSettingsService upon verification
      */
-    void onDismissed(@DismissedReason int reason,
+    void onDismissed(@BiometricPrompt.DismissedReason int reason,
                      @Nullable byte[] credentialAttestation, long requestId);
 
     /**