Merge changes from topic "biometric-ui-refactor" (bcab35cd) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/auth_biometric_fingerprint_view.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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.
		-->

		<com.android.systemui.biometrics.AuthBiometricFingerprintView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/contents"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<include layout="@layout/auth_biometric_contents"/>

		</com.android.systemui.biometrics.AuthBiometricFingerprintView>
		No newline at end of file

packages/SystemUI/res/layout/auth_container_view.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@
		android:id="@+id/background"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/biometric_dialog_dim_color"/>
		android:background="@color/biometric_dialog_dim_color"
		android:contentDescription="@string/biometric_dialog_empty_space_description"/>

		<View
		android:id="@+id/panel"

packages/SystemUI/res/values/strings.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@
		<!-- Button name on BiometricPrompt shown when a biometric is detected but not authenticated. Tapping the button resumes authentication [CHAR LIMIT=30] -->
		<string name="biometric_dialog_try_again">Try again</string>
		<!-- Content description for empty spaces that are not taken by the biometric dialog. Clicking on these areas will cancel authentication and dismiss the biometric dialog [CHAR LIMIT=NONE] -->
		<string name="biometric_dialog_empty_space_description">Empty region, tap to cancel authentication</string>
		<string name="biometric_dialog_empty_space_description">Tap to cancel authentication</string>
		<!-- Content description for the face icon when the device is not authenticating anymore [CHAR LIMIT=NONE] -->
		<string name="biometric_dialog_face_icon_description_idle">Please try again</string>
		<!-- Content description for the face icon when the device is authenticating [CHAR LIMIT=NONE] -->
		@@ -305,6 +305,8 @@
		<string name="biometric_dialog_face_icon_description_confirmed">Confirmed</string>
		<!-- Message shown when a biometric is authenticated, waiting for the user to confirm authentication [CHAR LIMIT=40]-->
		<string name="biometric_dialog_tap_confirm">Tap Confirm to complete</string>
		<!-- Talkback string when a biometric is authenticated [CHAR LIMIT=NONE] -->
		<string name="biometric_dialog_authenticated">Authenticated</string>

		<!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication -->
		<string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string>

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -111,8 +111,12 @@ public class AuthBiometricFaceView extends AuthBiometricView {
		R.string.biometric_dialog_face_icon_description_confirmed));
		} else if (lastStateIsErrorIcon && newState == STATE_IDLE) {
		animateOnce(R.drawable.face_dialog_error_to_idle);
		mIconView.setContentDescription(mContext.getString(
		R.string.biometric_dialog_face_icon_description_idle));
		} else if (lastStateIsErrorIcon && newState == STATE_AUTHENTICATED) {
		animateOnce(R.drawable.face_dialog_dark_to_checkmark);
		mIconView.setContentDescription(mContext.getString(
		R.string.biometric_dialog_face_icon_description_authenticated));
		} else if (newState == STATE_ERROR && lastState != STATE_ERROR) {
		animateOnce(R.drawable.face_dialog_dark_to_error);
		} else if (lastState == STATE_AUTHENTICATING && newState == STATE_AUTHENTICATED) {
		@@ -125,6 +129,8 @@ public class AuthBiometricFaceView extends AuthBiometricView {
		R.string.biometric_dialog_face_icon_description_authenticated));
		} else if (newState == STATE_IDLE) {
		showStaticDrawable(R.drawable.face_dialog_idle_static);
		mIconView.setContentDescription(mContext.getString(
		R.string.biometric_dialog_face_icon_description_idle));
		} else {
		Log.w(TAG, "Unhandled state: " + newState);
		}
		@@ -162,6 +168,11 @@ public class AuthBiometricFaceView extends AuthBiometricView {
		resetErrorView(mContext, mIndicatorView);
		}

		@Override
		protected boolean supportsSmallDialog() {
		return true;
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();

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

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		/*
		* 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.content.Context;
		import android.graphics.drawable.AnimatedVectorDrawable;
		import android.graphics.drawable.Drawable;
		import android.util.AttributeSet;
		import android.util.Log;

		import com.android.systemui.R;

		public class AuthBiometricFingerprintView extends AuthBiometricView {

		private static final String TAG = "BiometricPrompt/AuthBiometricFingerprintView";

		public AuthBiometricFingerprintView(Context context) {
		this(context, null);
		}

		public AuthBiometricFingerprintView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected int getDelayAfterAuthenticatedDurationMs() {
		return 0;
		}

		@Override
		protected int getStateForAfterError() {
		return STATE_AUTHENTICATING;
		}

		@Override
		protected void handleResetAfterError() {
		showTouchSensorString();
		}

		@Override
		protected void handleResetAfterHelp() {
		showTouchSensorString();
		}

		@Override
		protected boolean supportsSmallDialog() {
		return false;
		}

		@Override
		public void updateState(@BiometricState int newState) {
		updateIcon(mState, newState);

		// Do this last since the state variable gets updated.
		super.updateState(newState);
		}

		@Override
		void onAttachedToWindowInternal() {
		super.onAttachedToWindowInternal();
		showTouchSensorString();
		}

		private void showTouchSensorString() {
		mIndicatorView.setText(R.string.fingerprint_dialog_touch_sensor);
		mIndicatorView.setTextColor(R.color.biometric_dialog_gray);
		}

		private void updateIcon(int lastState, int newState) {
		final Drawable icon = getAnimationForTransition(lastState, newState);
		if (icon == null) {
		Log.e(TAG, "Animation not found, " + lastState + " -> " + newState);
		return;
		}

		final AnimatedVectorDrawable animation = icon instanceof AnimatedVectorDrawable
		? (AnimatedVectorDrawable) icon
		: null;

		mIconView.setImageDrawable(icon);

		if (animation != null && shouldAnimateForTransition(lastState, newState)) {
		animation.forceAnimationOnUI();
		animation.start();
		}
		}

		private boolean shouldAnimateForTransition(int oldState, int newState) {
		switch (newState) {
		case STATE_HELP:
		case STATE_ERROR:
		return true;
		case STATE_AUTHENTICATING_ANIMATING_IN:
		case STATE_AUTHENTICATING:
		if (oldState == STATE_ERROR \|\| oldState == STATE_HELP) {
		return true;
		} else {
		return false;
		}
		case STATE_AUTHENTICATED:
		return false;
		default:
		return false;
		}
		}

		private Drawable getAnimationForTransition(int oldState, int newState) {
		int iconRes;

		switch (newState) {
		case STATE_HELP:
		case STATE_ERROR:
		iconRes = R.drawable.fingerprint_dialog_fp_to_error;
		break;
		case STATE_AUTHENTICATING_ANIMATING_IN:
		case STATE_AUTHENTICATING:
		if (oldState == STATE_ERROR \|\| oldState == STATE_HELP) {
		iconRes = R.drawable.fingerprint_dialog_error_to_fp;
		} else {
		iconRes = R.drawable.fingerprint_dialog_fp_to_error;
		}
		break;
		case STATE_AUTHENTICATED:
		iconRes = R.drawable.fingerprint_dialog_fp_to_error;
		break;
		default:
		return null;
		}

		return mContext.getDrawable(iconRes);
		}
		}