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

Commit fdddf012 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Preemptively hide UDPFS icon on biometric authenticated" into udc-dev... 

Merge "Preemptively hide UDPFS icon on biometric authenticated" into udc-dev am: 5889aa77 am: 88d7cbe5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22383268



Change-Id: I3eb85f5415b5e6e788a1f9ff5de8301cb27552f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7cc5e88 88d7cbe5

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt

+12 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ constructor( 


    private val keyguardStateControllerCallback: KeyguardStateController.Callback =

        object : KeyguardStateController.Callback {

            override fun onUnlockedChanged() {

                updatePauseAuth()

            }

            override fun onLaunchTransitionFadingAwayChanged() {

                launchTransitionFadingAway = keyguardStateController.isLaunchTransitionFadingAway

                updatePauseAuth()
@@ -403,6 +406,15 @@ constructor( 
        if (isBouncerExpansionGreaterThan(.5f)) {

            return true

        }

        if (

            keyguardUpdateMonitor.getUserUnlockedWithBiometric(

                KeyguardUpdateMonitor.getCurrentUser()

            )

        ) {

            // If the device was unlocked by a biometric, immediately hide the UDFPS icon to avoid

            // overlap with the LockIconView. Shortly afterwards, UDFPS will stop running.

            return true

        }

        return view.unpausedAlpha < 255 * .1

    }

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.biometrics; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.never;
@@ -156,6 +157,22 @@ public class UdfpsKeyguardViewControllerTest extends UdfpsKeyguardViewController 
        assertFalse(mController.shouldPauseAuth());

    }



    @Test

    public void onBiometricAuthenticated_pauseAuth() {

        // GIVEN view is attached and we're on the keyguard (see testShouldNotPauseAuthOnKeyguard)

        mController.onViewAttached();

        captureStatusBarStateListeners();

        sendStatusBarStateChanged(StatusBarState.KEYGUARD);



        // WHEN biometric is authenticated

        captureKeyguardStateControllerCallback();

        when(mKeyguardUpdateMonitor.getUserUnlockedWithBiometric(anyInt())).thenReturn(true);

        mKeyguardStateControllerCallback.onUnlockedChanged();



        // THEN pause auth

        assertTrue(mController.shouldPauseAuth());

    }



    @Test

    public void testShouldPauseAuthIsLaunchTransitionFadingAway() {

        // GIVEN view is attached and we're on the keyguard (see testShouldNotPauseAuthOnKeyguard)