Merge cherrypicks of [8893728, 8892477, 8892478, 8893797, 8893798, 8893799,... (b653517b) · Commits · e / os / android_frameworks_base

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,9 @@ public abstract class BiometricDialogView extends LinearLayout {
		protected boolean mRequireConfirmation;
		private int mUserId; // used to determine if we should show work background

		private boolean mCompletedAnimatingIn;
		private boolean mPendingDismissDialog;

		protected abstract int getHintStringResourceId();
		protected abstract int getAuthenticatedAccessibilityResourceId();
		protected abstract int getIconDescriptionResourceId();
		@@ -332,6 +335,7 @@ public abstract class BiometricDialogView extends LinearLayout {
		mDialog.setAlpha(1.0f);
		mDialog.setTranslationY(0);
		mLayout.setAlpha(1.0f);
		mCompletedAnimatingIn = true;
		} else {
		// Dim the background and slide the dialog up
		mDialog.setTranslationY(mAnimationTranslationOffset);
		@@ -352,6 +356,12 @@ public abstract class BiometricDialogView extends LinearLayout {
		}

		public void startDismiss() {
		if (!mCompletedAnimatingIn) {
		Log.w(TAG, "startDismiss(): waiting for onDialogAnimatedIn");
		mPendingDismissDialog = true;
		return;
		}

		mAnimatingAway = true;

		// This is where final cleanup should occur.
		@@ -499,6 +509,13 @@ public abstract class BiometricDialogView extends LinearLayout {
		}

		public void onDialogAnimatedIn() {
		mCompletedAnimatingIn = true;

		if (mPendingDismissDialog) {
		Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now");
		startDismiss();
		mPendingDismissDialog = false;
		}
		}

		public void restoreState(Bundle bundle) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -460,6 +460,7 @@ public class FaceDialogView extends BiometricDialogView {

		@Override
		public void onDialogAnimatedIn() {
		super.onDialogAnimatedIn();
		mDialogAnimatedIn = true;
		mIconController.startPulsing();
		}

+5 −7

Original line number	Diff line number	Diff line
		@@ -207,7 +207,6 @@ public class KeyguardBouncer {
		* @see #onFullyShown()
		*/
		private void onFullyHidden() {
		if (!mShowingSoon) {
		cancelShowRunnable();
		if (mRoot != null) {
		mRoot.setVisibility(View.INVISIBLE);
		@@ -215,7 +214,6 @@ public class KeyguardBouncer {
		mFalsingManager.onBouncerHidden();
		DejankUtils.postAfterTraversal(mResetRunnable);
		}
		}

		private final Runnable mShowRunnable = new Runnable() {
		@Override

+6 −2

Original line number	Diff line number	Diff line
		@@ -912,8 +912,12 @@ public abstract class BiometricServiceBase extends SystemService
		}

		protected void setActiveUserInternal(int userId) {
		// Do not put on handler, since it should finish before returning to caller.
		mHandler.post(() -> {
		if (DEBUG) {
		Slog.d(getTag(), "setActiveUser(" + userId + ")");
		}
		updateActiveGroup(userId, null /* clientPackage */);
		});
		}

		protected void removeInternal(RemovalClient client) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ public abstract class LoggableMonitor {
		statsAction(),
		statsClient(),
		acquiredInfo,
		0 /* vendorCode */, // Don't log vendorCode for now
		vendorCode,
		Utils.isDebugEnabled(context, targetUserId));
		}