4/n: Rename files to make more sense

Also flatten the directory, there isn't much point in having a sub package
right now.

Bug: 123378871
Test: atest com.android.systemui.biometrics

Change-Id: I598f1909f6e6940d73da37921d9b5cd2c02f4331

19 files changed, 107 insertions, 126 deletions

diff --git a/packages/SystemUI/res/layout/auth_biometric_face_view.xml b/packages/SystemUI/res/layout/auth_biometric_face_view.xml
index 4fd98d66bbe3..be30f21af536 100644
--- a/packages/SystemUI/res/layout/auth_biometric_face_view.xml
+++ b/packages/SystemUI/res/layout/auth_biometric_face_view.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<com.android.systemui.biometrics.ui.AuthBiometricFaceView
+<com.android.systemui.biometrics.AuthBiometricFaceView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contents"
     android:layout_width="match_parent"
@@ -23,4 +23,4 @@
 
     <include layout="@layout/auth_biometric_contents"/>
 
-</com.android.systemui.biometrics.ui.AuthBiometricFaceView>
\ No newline at end of file
+</com.android.systemui.biometrics.AuthBiometricFaceView>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/auth_container_view.xml b/packages/SystemUI/res/layout/auth_container_view.xml
index 491169c7a171..d83776b74fd1 100644
--- a/packages/SystemUI/res/layout/auth_container_view.xml
+++ b/packages/SystemUI/res/layout/auth_container_view.xml
@@ -11,7 +11,7 @@
   ~ 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
+  ~ limitations under the License.
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 6e8e8236a99a..9214d98e1e09 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -292,7 +292,7 @@
         <item>com.android.systemui.LatencyTester</item>
         <item>com.android.systemui.globalactions.GlobalActionsComponent</item>
         <item>com.android.systemui.ScreenDecorations</item>
-        <item>com.android.systemui.biometrics.BiometricDialogImpl</item>
+        <item>com.android.systemui.biometrics.AuthController</item>
         <item>com.android.systemui.SliceBroadcastRelayHandler</item>
         <item>com.android.systemui.SizeCompatModeActivityController</item>
         <item>com.android.systemui.statusbar.notification.InstantAppNotifier</item>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthBiometricFaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceView.java
index 7aaafe8124f2..74cc9c39741e 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthBiometricFaceView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFaceView.java
@@ -11,10 +11,10 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.content.Context;
 import android.graphics.drawable.Animatable2;
@@ -30,7 +30,6 @@ import android.widget.TextView;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.systemui.R;
-import com.android.systemui.biometrics.BiometricDialog;
 
 public class AuthBiometricFaceView extends AuthBiometricView {
 
@@ -174,7 +173,7 @@ public class AuthBiometricFaceView extends AuthBiometricView {
         mIconController.updateState(mState, newState);
 
         if (newState == STATE_AUTHENTICATING_ANIMATING_IN ||
-                (newState == STATE_AUTHENTICATING && mSize == BiometricDialog.SIZE_MEDIUM)) {
+                (newState == STATE_AUTHENTICATING && mSize == AuthDialog.SIZE_MEDIUM)) {
             resetErrorView(mContext, mErrorView);
         }
 
@@ -184,7 +183,7 @@ public class AuthBiometricFaceView extends AuthBiometricView {
 
     @Override
     public void onAuthenticationFailed(String failureReason) {
-        if (mSize == BiometricDialog.SIZE_MEDIUM) {
+        if (mSize == AuthDialog.SIZE_MEDIUM) {
             mTryAgainButton.setVisibility(View.VISIBLE);
             mPositiveButton.setVisibility(View.GONE);
         }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
index 6f1581157d34..f26083998c76 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthBiometricView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -37,7 +37,6 @@ import android.widget.TextView;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.systemui.R;
-import com.android.systemui.biometrics.BiometricDialog;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -145,7 +144,7 @@ public abstract class AuthBiometricView extends LinearLayout {
     private AuthPanelController mPanelController;
     private Bundle mBundle;
     private boolean mRequireConfirmation;
-    @BiometricDialog.DialogSize int mSize = BiometricDialog.SIZE_UNKNOWN;
+    @AuthDialog.DialogSize int mSize = AuthDialog.SIZE_UNKNOWN;
 
     private TextView mTitleView;
     private TextView mSubtitleView;
@@ -165,7 +164,6 @@ public abstract class AuthBiometricView extends LinearLayout {
 
     private float mIconOriginalY;
 
-    protected boolean mDialogAnimatedIn;
     protected boolean mDialogSizeAnimating;
 
     /**
@@ -199,7 +197,7 @@ public abstract class AuthBiometricView extends LinearLayout {
         if (mState == STATE_AUTHENTICATED) {
             Log.w(TAG, "Ignoring background click after authenticated");
             return;
-        } else if (mSize == BiometricDialog.SIZE_SMALL) {
+        } else if (mSize == AuthDialog.SIZE_SMALL) {
             Log.w(TAG, "Ignoring background click during small dialog");
             return;
         }
@@ -248,9 +246,9 @@ public abstract class AuthBiometricView extends LinearLayout {
     }
 
     @VisibleForTesting
-    void updateSize(@BiometricDialog.DialogSize int newSize) {
+    void updateSize(@AuthDialog.DialogSize int newSize) {
         Log.v(TAG, "Current: " + mSize + " New: " + newSize);
-        if (newSize == BiometricDialog.SIZE_SMALL) {
+        if (newSize == AuthDialog.SIZE_SMALL) {
             mTitleView.setVisibility(View.GONE);
             mSubtitleView.setVisibility(View.GONE);
             mDescriptionView.setVisibility(View.GONE);
@@ -266,7 +264,7 @@ public abstract class AuthBiometricView extends LinearLayout {
                     false /* animate */);
 
             mSize = newSize;
-        } else if (mSize == BiometricDialog.SIZE_SMALL && newSize == BiometricDialog.SIZE_MEDIUM) {
+        } else if (mSize == AuthDialog.SIZE_SMALL && newSize == AuthDialog.SIZE_MEDIUM) {
             if (mDialogSizeAnimating) {
                 return;
             }
@@ -281,7 +279,7 @@ public abstract class AuthBiometricView extends LinearLayout {
 
             // Animate the text
             final ValueAnimator opacityAnimator = ValueAnimator.ofFloat(0, 1);
-            opacityAnimator.setDuration(BiometricDialog.ANIMATE_DURATION_MS);
+            opacityAnimator.setDuration(AuthDialog.ANIMATE_DURATION_MS);
             opacityAnimator.addUpdateListener((animation) -> {
                 final float opacity = (float) animation.getAnimatedValue();
 
@@ -300,7 +298,7 @@ public abstract class AuthBiometricView extends LinearLayout {
 
             // Choreograph together
             final AnimatorSet as = new AnimatorSet();
-            as.setDuration(BiometricDialog.ANIMATE_DURATION_MS);
+            as.setDuration(AuthDialog.ANIMATE_DURATION_MS);
             as.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationStart(Animator animation) {
@@ -330,7 +328,7 @@ public abstract class AuthBiometricView extends LinearLayout {
             // Animate the panel
             mPanelController.updateForContentDimensions(mMediumWidth, mMediumHeight,
                     true /* animate */);
-        } else if (newSize == BiometricDialog.SIZE_MEDIUM) {
+        } else if (newSize == AuthDialog.SIZE_MEDIUM) {
             mPanelController.updateForContentDimensions(mMediumWidth, mMediumHeight,
                     false /* animate */);
             mSize = newSize;
@@ -352,7 +350,7 @@ public abstract class AuthBiometricView extends LinearLayout {
                 break;
 
             case STATE_AUTHENTICATED:
-                if (mSize != BiometricDialog.SIZE_SMALL) {
+                if (mSize != AuthDialog.SIZE_SMALL) {
                     mPositiveButton.setVisibility(View.GONE);
                     mNegativeButton.setVisibility(View.GONE);
                     mErrorView.setVisibility(View.INVISIBLE);
@@ -372,8 +370,8 @@ public abstract class AuthBiometricView extends LinearLayout {
                 break;
 
             case STATE_ERROR:
-                if (mSize == BiometricDialog.SIZE_SMALL) {
-                    updateSize(BiometricDialog.SIZE_MEDIUM);
+                if (mSize == AuthDialog.SIZE_SMALL) {
+                    updateSize(AuthDialog.SIZE_MEDIUM);
                 }
                 break;
 
@@ -404,7 +402,7 @@ public abstract class AuthBiometricView extends LinearLayout {
     }
 
     public void onHelp(String help) {
-        if (mSize != BiometricDialog.SIZE_MEDIUM) {
+        if (mSize != AuthDialog.SIZE_MEDIUM) {
             return;
         }
         showTemporaryMessage(help, mResetHelpRunnable);
@@ -528,8 +526,8 @@ public abstract class AuthBiometricView extends LinearLayout {
         // only care about the initial icon position.
         if (mIconOriginalY == 0) {
             mIconOriginalY = mIconView.getY();
-            updateSize(mRequireConfirmation ? BiometricDialog.SIZE_MEDIUM
-                    : BiometricDialog.SIZE_SMALL);
+            updateSize(mRequireConfirmation ? AuthDialog.SIZE_MEDIUM
+                    : AuthDialog.SIZE_SMALL);
         }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
index b62336ea18a9..9cb5fcf4de00 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.annotation.IntDef;
 import android.content.Context;
@@ -38,8 +38,6 @@ import com.android.internal.annotations.VisibleForTesting;
 import com.android.systemui.Dependency;
 import com.android.systemui.Interpolators;
 import com.android.systemui.R;
-import com.android.systemui.biometrics.BiometricDialog;
-import com.android.systemui.biometrics.DialogViewCallback;
 import com.android.systemui.keyguard.WakefulnessLifecycle;
 
 import java.lang.annotation.Retention;
@@ -49,7 +47,7 @@ import java.lang.annotation.RetentionPolicy;
  * Top level container/controller for the BiometricPrompt UI.
  */
 public class AuthContainerView extends LinearLayout
-        implements BiometricDialog, WakefulnessLifecycle.Observer {
+        implements AuthDialog, WakefulnessLifecycle.Observer {
 
     private static final String TAG = "BiometricPrompt/AuthContainerView";
     private static final int ANIMATION_DURATION_SHOW_MS = 250;
@@ -89,7 +87,7 @@ public class AuthContainerView extends LinearLayout
 
     static class Config {
         Context mContext;
-        DialogViewCallback mCallback;
+        AuthDialogCallback mCallback;
         Bundle mBiometricPromptBundle;
         boolean mRequireConfirmation;
         int mUserId;
@@ -106,7 +104,7 @@ public class AuthContainerView extends LinearLayout
             mConfig.mContext = context;
         }
 
-        public Builder setCallback(DialogViewCallback callback) {
+        public Builder setCallback(AuthDialogCallback callback) {
             mConfig.mCallback = callback;
             return this;
         }
@@ -147,13 +145,13 @@ public class AuthContainerView extends LinearLayout
         public void onAction(int action) {
             switch (action) {
                 case AuthBiometricView.Callback.ACTION_AUTHENTICATED:
-                    animateAway(DialogViewCallback.DISMISSED_AUTHENTICATED);
+                    animateAway(AuthDialogCallback.DISMISSED_AUTHENTICATED);
                     break;
                 case AuthBiometricView.Callback.ACTION_USER_CANCELED:
-                    animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+                    animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
                     break;
                 case AuthBiometricView.Callback.ACTION_BUTTON_NEGATIVE:
-                    animateAway(DialogViewCallback.DISMISSED_BUTTON_NEGATIVE);
+                    animateAway(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE);
                     break;
                 case AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN:
                     mConfig.mCallback.onTryAgainPressed();
@@ -205,7 +203,7 @@ public class AuthContainerView extends LinearLayout
                 return false;
             }
             if (event.getAction() == KeyEvent.ACTION_UP) {
-                animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+                animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
             }
             return true;
         });
@@ -267,7 +265,7 @@ public class AuthContainerView extends LinearLayout
 
     @Override
     public void onStartedGoingToSleep() {
-        animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+        animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
     }
 
     @Override
@@ -329,7 +327,7 @@ public class AuthContainerView extends LinearLayout
         animateAway(true /* sendReason */, reason);
     }
 
-    private void animateAway(boolean sendReason, @DialogViewCallback.DismissedReason int reason) {
+    private void animateAway(boolean sendReason, @AuthDialogCallback.DismissedReason int reason) {
         if (mContainerState == STATE_ANIMATING_IN) {
             Log.w(TAG, "startDismiss(): waiting for onDialogAnimatedIn");
             mContainerState = STATE_PENDING_DISMISS;
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
index 6aff3f7010f2..dcd01c682726 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
@@ -11,7 +11,7 @@
  * 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
+ * limitations under the License.
  */
 
 package com.android.systemui.biometrics;
@@ -36,8 +36,6 @@ import android.view.WindowManager;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.os.SomeArgs;
 import com.android.systemui.SystemUI;
-import com.android.systemui.biometrics.ui.BiometricDialogView;
-import com.android.systemui.biometrics.ui.AuthContainerView;
 import com.android.systemui.statusbar.CommandQueue;
 
 import java.util.List;
@@ -46,12 +44,12 @@ import java.util.List;
  * Receives messages sent from {@link com.android.server.biometrics.BiometricService} and shows the
  * appropriate biometric UI (e.g. BiometricDialogView).
  */
-public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callbacks,
-        DialogViewCallback {
+public class AuthController extends SystemUI implements CommandQueue.Callbacks,
+        AuthDialogCallback {
     private static final String USE_NEW_DIALOG =
-            "com.android.systemui.biometrics.BiometricDialogImpl.USE_NEW_DIALOG";
+            "com.android.systemui.biometrics.AuthController.USE_NEW_DIALOG";
 
-    private static final String TAG = "BiometricDialogImpl";
+    private static final String TAG = "BiometricPrompt/AuthController";
     private static final boolean DEBUG = true;
 
     private final Injector mInjector;
@@ -59,7 +57,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba
     // TODO: These should just be saved from onSaveState
     private SomeArgs mCurrentDialogArgs;
     @VisibleForTesting
-    BiometricDialog mCurrentDialog;
+    AuthDialog mCurrentDialog;
 
     private Handler mHandler = new Handler(Looper.getMainLooper());
     private WindowManager mWindowManager;
@@ -112,27 +110,27 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba
     @Override
     public void onDismissed(@DismissedReason int reason) {
         switch (reason) {
-            case DialogViewCallback.DISMISSED_USER_CANCELED:
+            case AuthDialogCallback.DISMISSED_USER_CANCELED:
                 sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
                 break;
 
-            case DialogViewCallback.DISMISSED_BUTTON_NEGATIVE:
+            case AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE:
                 sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_NEGATIVE);
                 break;
 
-            case DialogViewCallback.DISMISSED_BUTTON_POSITIVE:
+            case AuthDialogCallback.DISMISSED_BUTTON_POSITIVE:
                 sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CONFIRMED);
                 break;
 
-            case DialogViewCallback.DISMISSED_AUTHENTICATED:
+            case AuthDialogCallback.DISMISSED_AUTHENTICATED:
                 sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CONFIRM_NOT_REQUIRED);
                 break;
 
-            case DialogViewCallback.DISMISSED_ERROR:
+            case AuthDialogCallback.DISMISSED_ERROR:
                 sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_ERROR);
                 break;
 
-            case DialogViewCallback.DISMISSED_BY_SYSTEM_SERVER:
+            case AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER:
                 sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED);
                 break;
 
@@ -161,12 +159,12 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba
         }
     }
 
-    public BiometricDialogImpl() {
+    public AuthController() {
         this(new Injector());
     }
 
     @VisibleForTesting
-    BiometricDialogImpl(Injector injector) {
+    AuthController(Injector injector) {
         mInjector = injector;
     }
 
@@ -253,7 +251,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba
         final String opPackageName = (String) args.arg4;
 
         // Create a new dialog but do not replace the current one yet.
-        final BiometricDialog newDialog = buildDialog(
+        final AuthDialog newDialog = buildDialog(
                 biometricPromptBundle,
                 requireConfirmation,
                 userId,
@@ -315,7 +313,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba
         }
     }
 
-    protected BiometricDialog buildDialog(Bundle biometricPromptBundle, boolean requireConfirmation,
+    protected AuthDialog buildDialog(Bundle biometricPromptBundle, boolean requireConfirmation,
             int userId, int type, String opPackageName, boolean skipIntro) {
         if (Settings.Secure.getIntForUser(
                 mContext.getContentResolver(), USE_NEW_DIALOG, userId, 0) != 0) {
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialog.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java
index a0907d92d1fb..a6a857ca5945 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java
@@ -21,15 +21,13 @@ import android.hardware.biometrics.BiometricPrompt;
 import android.os.Bundle;
 import android.view.WindowManager;
 
-import com.android.systemui.biometrics.ui.BiometricDialogView;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
  * Interface for the biometric dialog UI.
  */
-public interface BiometricDialog {
+public interface AuthDialog {
 
     // TODO: Clean up save/restore state
     String[] KEYS_TO_BACKUP = {
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/DialogViewCallback.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java
index b65d1e823a9b..70752f5f860e 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/DialogViewCallback.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java
@@ -11,7 +11,7 @@
  * 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
+ * limitations under the License.
  */
 
 package com.android.systemui.biometrics;
@@ -22,7 +22,7 @@ import android.annotation.IntDef;
  * 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 DialogViewCallback {
+public interface AuthDialogCallback {
 
     int DISMISSED_USER_CANCELED = 1;
     int DISMISSED_BUTTON_NEGATIVE = 2;
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthPanelController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java
index ac1a70f0ea04..55ba0491dc1e 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/AuthPanelController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -24,7 +24,7 @@ import android.view.View;
 import android.view.ViewOutlineProvider;
 
 import com.android.systemui.R;
-import com.android.systemui.biometrics.BiometricDialog;
+import com.android.systemui.biometrics.AuthDialog;
 
 /**
  * Controls the back panel and its animations for the BiometricPrompt UI.
@@ -78,7 +78,7 @@ public class AuthPanelController extends ViewOutlineProvider {
 
         if (animate) {
             ValueAnimator heightAnimator = ValueAnimator.ofInt(mContentHeight, contentHeight);
-            heightAnimator.setDuration(BiometricDialog.ANIMATE_DURATION_MS);
+            heightAnimator.setDuration(AuthDialog.ANIMATE_DURATION_MS);
             heightAnimator.addUpdateListener((animation) -> {
                 mContentHeight = (int) animation.getAnimatedValue();
                 mPanelView.invalidateOutline();
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/BiometricDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java
index 58fb3d869e74..89d08d795128 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/BiometricDialogView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE;
 
@@ -58,17 +58,15 @@ import com.android.internal.annotations.VisibleForTesting;
 import com.android.systemui.Dependency;
 import com.android.systemui.Interpolators;
 import com.android.systemui.R;
-import com.android.systemui.biometrics.BiometricDialog;
-import com.android.systemui.biometrics.DialogViewCallback;
 import com.android.systemui.keyguard.WakefulnessLifecycle;
 import com.android.systemui.util.leak.RotationUtils;
 
 /**
  * Abstract base class. Shows a dialog for BiometricPrompt.
  */
-public abstract class BiometricDialogView extends LinearLayout implements BiometricDialog {
+public abstract class BiometricDialogView extends LinearLayout implements AuthDialog {
 
-    private static final String TAG = "BiometricDialogView";
+    private static final String TAG = "BiometricPrompt/DialogView";
 
     public static final String KEY_TRY_AGAIN_VISIBILITY = "key_try_again_visibility";
     public static final String KEY_CONFIRM_VISIBILITY = "key_confirm_visibility";
@@ -112,7 +110,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
     private final float mAnimationTranslationOffset;
     private final int mErrorColor;
     private final float mDialogWidth;
-    protected final DialogViewCallback mCallback;
+    protected final AuthDialogCallback mCallback;
     private final DialogOutlineProvider mOutlineProvider = new DialogOutlineProvider();
 
     protected final ViewGroup mLayout;
@@ -176,7 +174,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
             new WakefulnessLifecycle.Observer() {
                 @Override
                 public void onStartedGoingToSleep() {
-                    animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+                    animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
                 }
             };
 
@@ -226,7 +224,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
         public static final int TYPE_FACE = BiometricAuthenticator.TYPE_FACE;
 
         private Context mContext;
-        private DialogViewCallback mCallback;
+        private AuthDialogCallback mCallback;
         private Bundle mBundle;
         private boolean mRequireConfirmation;
         private int mUserId;
@@ -237,7 +235,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
             mContext = context;
         }
 
-        public Builder setCallback(DialogViewCallback callback) {
+        public Builder setCallback(AuthDialogCallback callback) {
             mCallback = callback;
             return this;
         }
@@ -295,7 +293,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
         }
     }
 
-    protected BiometricDialogView(Context context, DialogViewCallback callback, Injector injector) {
+    protected BiometricDialogView(Context context, AuthDialogCallback callback, Injector injector) {
         super(context);
         mWakefulnessLifecycle = injector.getWakefulnessLifecycle();
 
@@ -326,7 +324,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
                     return false;
                 }
                 if (event.getAction() == KeyEvent.ACTION_UP) {
-                    animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+                    animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
                 }
                 return true;
             }
@@ -355,16 +353,16 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
 
         mNegativeButton.setOnClickListener((View v) -> {
             if (mState == STATE_PENDING_CONFIRMATION || mState == STATE_AUTHENTICATED) {
-                animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+                animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
             } else {
-                animateAway(DialogViewCallback.DISMISSED_BUTTON_NEGATIVE);
+                animateAway(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE);
             }
         });
 
         mPositiveButton.setOnClickListener((View v) -> {
             updateState(STATE_AUTHENTICATED);
             mHandler.postDelayed(() -> {
-                animateAway(DialogViewCallback.DISMISSED_BUTTON_POSITIVE);
+                animateAway(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE);
             }, getDelayAfterAuthenticatedDurationMs());
         });
 
@@ -515,7 +513,6 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
         mWakefulnessLifecycle.removeObserver(mWakefulnessObserver);
     }
 
-
     @VisibleForTesting
     void updateSize(@DialogSize int newSize) {
         final float padding = Utils.dpToPixels(mContext, IMPLICIT_Y_PADDING);
@@ -647,20 +644,20 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
         v.setClickable(true);
         v.setOnClickListener(v1 -> {
             if (mState != STATE_AUTHENTICATED && shouldGrayAreaDismissDialog()) {
-                animateAway(DialogViewCallback.DISMISSED_USER_CANCELED);
+                animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
             }
         });
     }
 
-    private void animateAway(@DialogViewCallback.DismissedReason int reason) {
+    private void animateAway(@AuthDialogCallback.DismissedReason int reason) {
         animateAway(true /* sendReason */, reason);
     }
 
     /**
      * Animate the dialog away
-     * @param reason one of the {@link DialogViewCallback} codes
+     * @param reason one of the {@link AuthDialogCallback} codes
      */
-    private void animateAway(boolean sendReason, @DialogViewCallback.DismissedReason int reason) {
+    private void animateAway(boolean sendReason, @AuthDialogCallback.DismissedReason int reason) {
         if (!mCompletedAnimatingIn) {
             Log.w(TAG, "startDismiss(): waiting for onDialogAnimatedIn");
             mPendingDismissDialog = true;
@@ -764,7 +761,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
 
     @Override
     public void dismissFromSystemServer() {
-        animateAway(DialogViewCallback.DISMISSED_BY_SYSTEM_SERVER);
+        animateAway(AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER);
     }
 
     @Override
@@ -775,7 +772,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
             updateState(STATE_PENDING_CONFIRMATION);
         } else {
             mHandler.postDelayed(() -> {
-                animateAway(DialogViewCallback.DISMISSED_AUTHENTICATED);
+                animateAway(AuthDialogCallback.DISMISSED_AUTHENTICATED);
             }, getDelayAfterAuthenticatedDurationMs());
 
             updateState(STATE_AUTHENTICATED);
@@ -817,7 +814,7 @@ public abstract class BiometricDialogView extends LinearLayout implements Biomet
         showTryAgainButton(false /* show */);
 
         mHandler.postDelayed(() -> {
-            animateAway(DialogViewCallback.DISMISSED_ERROR);
+            animateAway(AuthDialogCallback.DISMISSED_ERROR);
         }, BiometricPrompt.HIDE_DIALOG_DELAY);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/FaceDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java
index 9e4fe24aec40..d5dcbf126b63 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/FaceDialogView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/FaceDialogView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.content.Context;
 import android.graphics.drawable.Animatable2;
@@ -26,7 +26,6 @@ import android.util.Log;
 import android.view.View;
 
 import com.android.systemui.R;
-import com.android.systemui.biometrics.DialogViewCallback;
 
 /**
  * This class loads the view for the system-provided dialog. The view consists of:
@@ -35,7 +34,7 @@ import com.android.systemui.biometrics.DialogViewCallback;
  */
 public class FaceDialogView extends BiometricDialogView {
 
-    private static final String TAG = "FaceDialogView";
+    private static final String TAG = "BiometricPrompt/FaceDialogView";
 
     private static final String KEY_DIALOG_ANIMATED_IN = "key_dialog_animated_in";
 
@@ -110,7 +109,7 @@ public class FaceDialogView extends BiometricDialogView {
         announceAccessibilityEvent();
     };
 
-    protected FaceDialogView(Context context, DialogViewCallback callback, Injector injector) {
+    protected FaceDialogView(Context context, AuthDialogCallback callback, Injector injector) {
         super(context, callback, injector);
         mIconController = new IconController();
     }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/FingerprintDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java
index 292588024646..cda217619eed 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/FingerprintDialogView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.content.Context;
 import android.graphics.drawable.AnimatedVectorDrawable;
@@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable;
 import android.util.Log;
 
 import com.android.systemui.R;
-import com.android.systemui.biometrics.DialogViewCallback;
 
 /**
  * This class loads the view for the system-provided dialog. The view consists of:
@@ -31,9 +30,9 @@ import com.android.systemui.biometrics.DialogViewCallback;
  */
 public class FingerprintDialogView extends BiometricDialogView {
 
-    private static final String TAG = "FingerprintDialogView";
+    private static final String TAG = "BiometricPrompt/FingerprintDialogView";
 
-    protected FingerprintDialogView(Context context, DialogViewCallback callback,
+    protected FingerprintDialogView(Context context, AuthDialogCallback callback,
             Injector injector) {
         super(context, callback, injector);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/Utils.java b/packages/SystemUI/src/com/android/systemui/biometrics/Utils.java
index 028b1aa5b513..edd8089c35f9 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/Utils.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/AuthBiometricFaceViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFaceViewTest.java
index 97083171528b..128e819ccedd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/AuthBiometricFaceViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFaceViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/AuthBiometricViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java
index 4086c0d60792..ffcb293ba398 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/AuthBiometricViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -34,7 +34,6 @@ import android.widget.TextView;
 
 import com.android.systemui.R;
 import com.android.systemui.SysuiTestCase;
-import com.android.systemui.biometrics.BiometricDialog;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -186,7 +185,7 @@ public class AuthBiometricViewTest extends SysuiTestCase {
     public void testBackgroundClicked_whenSmallDialog_neverSendsUserCanceled() {
         initDialog(mContext, mCallback, new MockInjector());
         mBiometricView.setPanelController(mPanelController);
-        mBiometricView.updateSize(BiometricDialog.SIZE_SMALL);
+        mBiometricView.updateSize(AuthDialog.SIZE_SMALL);
 
         View view = new View(mContext);
         mBiometricView.setBackgroundView(view);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/AuthContainerViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java
index 376a27f18323..25e27ef6b781 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/AuthContainerViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
@@ -24,7 +24,6 @@ import android.testing.AndroidTestingRunner;
 import android.testing.TestableLooper.RunWithLooper;
 
 import com.android.systemui.SysuiTestCase;
-import com.android.systemui.biometrics.DialogViewCallback;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +38,7 @@ public class AuthContainerViewTest extends SysuiTestCase {
 
     private TestableAuthContainer mAuthContainer;
 
-    private @Mock DialogViewCallback mDialogViewCallback;
+    private @Mock AuthDialogCallback mCallback;
 
     @Before
     public void setup() {
@@ -47,7 +46,7 @@ public class AuthContainerViewTest extends SysuiTestCase {
 
         AuthContainerView.Config config = new AuthContainerView.Config();
         config.mContext = mContext;
-        config.mCallback = mDialogViewCallback;
+        config.mCallback = mCallback;
         mAuthContainer = new TestableAuthContainer(config);
     }
 
@@ -55,28 +54,28 @@ public class AuthContainerViewTest extends SysuiTestCase {
     public void testActionAuthenticated_sendsDismissedAuthenticated() {
         mAuthContainer.mBiometricCallback.onAction(
                 AuthBiometricView.Callback.ACTION_AUTHENTICATED);
-        verify(mDialogViewCallback).onDismissed(eq(DialogViewCallback.DISMISSED_AUTHENTICATED));
+        verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_AUTHENTICATED));
     }
 
     @Test
     public void testActionUserCanceled_sendsDismissedUserCanceled() {
         mAuthContainer.mBiometricCallback.onAction(
                 AuthBiometricView.Callback.ACTION_USER_CANCELED);
-        verify(mDialogViewCallback).onDismissed(eq(DialogViewCallback.DISMISSED_USER_CANCELED));
+        verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_USER_CANCELED));
     }
 
     @Test
     public void testActionButtonNegative_sendsDismissedButtonNegative() {
         mAuthContainer.mBiometricCallback.onAction(
                 AuthBiometricView.Callback.ACTION_BUTTON_NEGATIVE);
-        verify(mDialogViewCallback).onDismissed(eq(DialogViewCallback.DISMISSED_BUTTON_NEGATIVE));
+        verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE));
     }
 
     @Test
     public void testActionTryAgain_sendsTryAgain() {
         mAuthContainer.mBiometricCallback.onAction(
                 AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN);
-        verify(mDialogViewCallback).onTryAgainPressed();
+        verify(mCallback).onTryAgainPressed();
     }
 
     private class TestableAuthContainer extends AuthContainerView {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDialogImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java
index 6af8956fccc8..a5e468e0545d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDialogImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java
@@ -58,16 +58,16 @@ import java.util.List;
 @RunWith(AndroidTestingRunner.class)
 @RunWithLooper
 @SmallTest
-public class BiometricDialogImplTest extends SysuiTestCase {
+public class AuthControllerTest extends SysuiTestCase {
 
     @Mock
     private PackageManager mPackageManager;
     @Mock
     private IBiometricServiceReceiverInternal mReceiver;
     @Mock
-    private BiometricDialog mDialog1;
+    private AuthDialog mDialog1;
     @Mock
-    private BiometricDialog mDialog2;
+    private AuthDialog mDialog2;
 
     private TestableBiometricDialogImpl mBiometricDialogImpl;
 
@@ -102,42 +102,42 @@ public class BiometricDialogImplTest extends SysuiTestCase {
     @Test
     public void testSendsReasonUserCanceled_whenDismissedByUserCancel() throws Exception {
         showDialog(BiometricPrompt.TYPE_FACE);
-        mBiometricDialogImpl.onDismissed(DialogViewCallback.DISMISSED_USER_CANCELED);
+        mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED);
         verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
     }
 
     @Test
     public void testSendsReasonNegative_whenDismissedByButtonNegative() throws Exception {
         showDialog(BiometricPrompt.TYPE_FACE);
-        mBiometricDialogImpl.onDismissed(DialogViewCallback.DISMISSED_BUTTON_NEGATIVE);
+        mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE);
         verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_NEGATIVE);
     }
 
     @Test
     public void testSendsReasonConfirmed_whenDismissedByButtonPositive() throws Exception {
         showDialog(BiometricPrompt.TYPE_FACE);
-        mBiometricDialogImpl.onDismissed(DialogViewCallback.DISMISSED_BUTTON_POSITIVE);
+        mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE);
         verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_CONFIRMED);
     }
 
     @Test
     public void testSendsReasonConfirmNotRequired_whenDismissedByAuthenticated() throws Exception {
         showDialog(BiometricPrompt.TYPE_FACE);
-        mBiometricDialogImpl.onDismissed(DialogViewCallback.DISMISSED_AUTHENTICATED);
+        mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_AUTHENTICATED);
         verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_CONFIRM_NOT_REQUIRED);
     }
 
     @Test
     public void testSendsReasonError_whenDismissedByError() throws Exception {
         showDialog(BiometricPrompt.TYPE_FACE);
-        mBiometricDialogImpl.onDismissed(DialogViewCallback.DISMISSED_ERROR);
+        mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_ERROR);
         verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_ERROR);
     }
 
     @Test
     public void testSendsReasonDismissedBySystemServer_whenDismissedByServer() throws Exception {
         showDialog(BiometricPrompt.TYPE_FACE);
-        mBiometricDialogImpl.onDismissed(DialogViewCallback.DISMISSED_BY_SYSTEM_SERVER);
+        mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER);
         verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED);
     }
 
@@ -296,7 +296,7 @@ public class BiometricDialogImplTest extends SysuiTestCase {
         return bundle;
     }
 
-    private final class TestableBiometricDialogImpl extends BiometricDialogImpl {
+    private final class TestableBiometricDialogImpl extends AuthController {
         private int mBuildCount = 0;
 
         public TestableBiometricDialogImpl(Injector injector) {
@@ -304,10 +304,10 @@ public class BiometricDialogImplTest extends SysuiTestCase {
         }
 
         @Override
-        protected BiometricDialog buildDialog(Bundle biometricPromptBundle,
+        protected AuthDialog buildDialog(Bundle biometricPromptBundle,
                 boolean requireConfirmation, int userId, int type, String opPackageName,
                 boolean skipIntro) {
-            BiometricDialog dialog;
+            AuthDialog dialog;
             if (mBuildCount == 0) {
                 dialog = mDialog1;
             } else if (mBuildCount == 1) {
@@ -320,7 +320,7 @@ public class BiometricDialogImplTest extends SysuiTestCase {
         }
     }
 
-    private final class MockInjector extends BiometricDialogImpl.Injector {
+    private final class MockInjector extends AuthController.Injector {
         @Override
         IActivityTaskManager getActivityTaskManager() {
             return mock(IActivityTaskManager.class);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/BiometricDialogViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDialogViewTest.java
index bbdd837bb446..3ff1f383fdee 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/BiometricDialogViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricDialogViewTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.systemui.biometrics.ui;
+package com.android.systemui.biometrics;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotSame;
@@ -32,12 +32,9 @@ import android.testing.AndroidTestingRunner;
 import android.testing.TestableContext;
 import android.testing.TestableLooper.RunWithLooper;
 import android.view.View;
-import android.view.WindowManager;
-import android.view.accessibility.AccessibilityManager;
 
 import com.android.systemui.R;
 import com.android.systemui.SysuiTestCase;
-import com.android.systemui.biometrics.DialogViewCallback;
 import com.android.systemui.keyguard.WakefulnessLifecycle;
 
 import org.junit.Before;
@@ -62,7 +59,7 @@ public class BiometricDialogViewTest extends SysuiTestCase {
 
     TestableContext mTestableContext;
     @Mock
-    private DialogViewCallback mCallback;
+    private AuthDialogCallback mCallback;
     @Mock
     private UserManager mUserManager;
     @Mock
@@ -176,7 +173,7 @@ public class BiometricDialogViewTest extends SysuiTestCase {
         assertEquals(View.VISIBLE, mFaceDialogView.mTryAgainButton.getVisibility());
     }
 
-    private FaceDialogView buildFaceDialogView(Context context, DialogViewCallback callback,
+    private FaceDialogView buildFaceDialogView(Context context, AuthDialogCallback callback,
             boolean requireConfirmation) {
         return (FaceDialogView) new BiometricDialogView.Builder(context)
                 .setCallback(callback)