commit 6cf54e8190c35d978970d7795f2783dc46c3571b
author Kevin Chyn <kchyn@google.com> Tue Sep 18 19:13:27 2018 -0700
committer Kevin Chyn <kchyn@google.com> Thu Sep 20 17:53:10 2018 -0700
tree 817688e808dc9ea1813575a34a8d4b39b137163b
parent 0be1f33757e700fd0098bd73832eb604a7bb6c82

3/n: Add FaceDialogView and "confirmation" plumbing

This change adds plumbing from <Biometric>Service to SystemUI for requiring
user confirmation (or not). This change also fixes some layout bugs
that were hard to notice.

Bug: 111461540
Fixes: 113130114
Fixes: 116135579

Test: With confirmation, crypto operation does not work until token
      is added to Keystore
Test: Without confirmation, crypto operation works when biometric is
      authenticated
Test: BiometricPromptDemo works, UI elements are all correct
Test: Talkback messages are correct

Change-Id: I2c05577699a29c09777cae4db6c7334c1e6bc179

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

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java
index 9033322..38a69a9 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java
@@ -33,19 +33,18 @@
     private static final String TAG = "FingerprintDialogView";
 
     @Override
-    protected int getLayoutResourceId() {
-        return R.layout.fingerprint_dialog;
-    }
-
-    @Override
-    protected int getHintStringResource() {
+    protected int getHintStringResourceId() {
         return R.string.fingerprint_dialog_touch_sensor;
     }
 
     @Override
-    protected float getAnimationTranslationOffset() {
-        return getResources()
-                .getDimension(R.dimen.fingerprint_dialog_animation_translation_offset);
+    protected int getAuthenticatedAccessibilityResourceId() {
+        return com.android.internal.R.string.fingerprint_authenticated;
+    }
+
+    @Override
+    protected int getIconDescriptionResourceId() {
+        return R.string.accessibility_fingerprint_dialog_fingerprint_icon;
     }
 
     @Override
@@ -61,8 +60,8 @@
                 ? (AnimatedVectorDrawable) icon
                 : null;
 
-        final ImageView fingerprint_icon = getLayout().findViewById(R.id.fingerprint_icon);
-        fingerprint_icon.setImageDrawable(icon);
+        final ImageView fingerprintIcon = getLayout().findViewById(R.id.biometric_icon);
+        fingerprintIcon.setImageDrawable(icon);
 
         if (animation != null && shouldAnimateForTransition(lastState, newState)) {
             animation.forceAnimationOnUI();