Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dcb897b authored by Diya Bera's avatar Diya Bera
Browse files

Stop biometric prompt dismissal animation from cancelling 

The "show" animation interrupts the dismissal animation and causes the
biometric prompt to be shown even when an error has occured.

Test: N/A
Fixes: 308667953
Change-Id: Ie1078c98758b8c625be844970b99096e6fdb5c23
parent a081f8a6

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

+6 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.biometrics; 


import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_BIOMETRIC_PROMPT_TRANSITION;



import android.animation.Animator;
@@ -63,7 +64,6 @@ import com.android.app.animation.Interpolators; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.res.R;

import com.android.systemui.biometrics.AuthController.ScaleFactorProvider;

import com.android.systemui.biometrics.domain.interactor.PromptCredentialInteractor;

import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor;
@@ -78,6 +78,7 @@ import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel; 
import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -492,6 +493,10 @@ public class AuthContainerView extends LinearLayout 
    public void onAttachedToWindow() {

        super.onAttachedToWindow();



        if (mContainerState == STATE_ANIMATING_OUT) {

            return;

        }



        mWakefulnessLifecycle.addObserver(this);

        mPanelInteractionDetector.enable(

                () -> animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED));

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+11 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.systemui.flags.FakeFeatureFlags 
import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.WakefulnessLifecycle

import com.android.systemui.statusbar.VibratorHelper

import com.android.systemui.statusbar.events.ANIMATING_OUT

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.time.FakeSystemClock

import com.google.common.truth.Truth.assertThat
@@ -210,6 +211,16 @@ open class AuthContainerViewTest : SysuiTestCase() { 
        )

    }



    @Test

    fun testIgnoresAnimatedInWhenDialogAnimatingOut() {

        val container = initializeFingerprintContainer(addToView = false)

        container.mContainerState = ANIMATING_OUT

        container.addToView()

        waitForIdleSync()



        verify(callback, never()).onDialogAnimatedIn(anyLong(), anyBoolean())

    }



    @Test

    fun testDismissBeforeIntroEnd() {

        val container = initializeFingerprintContainer()