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

Commit 515c3750 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge "Enable face scanning animation when the biometric prompt is being... 

Merge "Enable face scanning animation when the biometric prompt is being shown" into udc-dev am: 216d0637 am: 2988de86

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



Change-Id: I1181b49e5c2cfc4349bfb975ed91a4909ead7451
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4e913de 2988de86

packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt

+5 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.settingslib.Utils

import com.android.systemui.animation.Interpolators

import com.android.systemui.biometrics.AuthController

import com.android.systemui.log.ScreenDecorationsLogger

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.util.asIndenting
@@ -52,6 +53,7 @@ class FaceScanningOverlay( 
    val keyguardUpdateMonitor: KeyguardUpdateMonitor,

    val mainExecutor: Executor,

    val logger: ScreenDecorationsLogger,

    val authController: AuthController,

) : ScreenDecorations.DisplayCutoutView(context, pos) {

    private var showScanningAnim = false

    private val rimPaint = Paint()
@@ -102,7 +104,9 @@ class FaceScanningOverlay( 
    }



    override fun enableShowProtection(show: Boolean) {

        val showScanningAnimNow = keyguardUpdateMonitor.isFaceDetectionRunning && show

        val animationRequired =

                keyguardUpdateMonitor.isFaceDetectionRunning || authController.isShowing

        val showScanningAnimNow = animationRequired && show

        if (showScanningAnimNow == showScanningAnim) {

            return

        }

packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt

+3 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ class FaceScanningProviderFactory @Inject constructor( 
    }



    fun shouldShowFaceScanningAnim(): Boolean {

        return canShowFaceScanningAnim() && keyguardUpdateMonitor.isFaceDetectionRunning

        return canShowFaceScanningAnim() &&

                (keyguardUpdateMonitor.isFaceDetectionRunning || authController.isShowing)

    }

}
@@ -142,6 +143,7 @@ class FaceScanningOverlayProviderImpl( 
                keyguardUpdateMonitor,

                mainExecutor,

                logger,

                authController,

        )

        view.id = viewId

        view.setColor(tintColor)

packages/SystemUI/tests/src/com/android/systemui/FaceScanningProviderFactoryTest.kt

0 → 100644
+119 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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



import android.graphics.Point

import android.hardware.display.DisplayManagerGlobal

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper.RunWithLooper

import android.view.Display

import android.view.DisplayAdjustments

import android.view.DisplayInfo

import androidx.test.filters.SmallTest

import com.android.internal.R

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.biometrics.AuthController

import com.android.systemui.decor.FaceScanningProviderFactory

import com.android.systemui.dump.logcatLogBuffer

import com.android.systemui.log.ScreenDecorationsLogger

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat

import java.util.concurrent.Executor

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentMatchers.eq

import org.mockito.Mock

import org.mockito.Mockito.mock

import org.mockito.MockitoAnnotations



@RunWithLooper

@RunWith(AndroidTestingRunner::class)

@SmallTest

class FaceScanningProviderFactoryTest : SysuiTestCase() {



    private lateinit var underTest: FaceScanningProviderFactory



    @Mock private lateinit var authController: AuthController



    @Mock private lateinit var statusBarStateController: StatusBarStateController



    @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor



    @Mock private lateinit var display: Display



    private val displayId = 2



    @Before

    fun setup() {

        MockitoAnnotations.initMocks(this)



        val displayInfo = DisplayInfo()

        val dmGlobal = mock(DisplayManagerGlobal::class.java)

        val display =

            Display(

                dmGlobal,

                displayId,

                displayInfo,

                DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS

            )

        whenever(dmGlobal.getDisplayInfo(eq(displayId))).thenReturn(displayInfo)

        val displayContext = context.createDisplayContext(display) as SysuiTestableContext

        displayContext.orCreateTestableResources.addOverride(

            R.array.config_displayUniqueIdArray,

            arrayOf(displayId)

        )

        displayContext.orCreateTestableResources.addOverride(

            R.bool.config_fillMainBuiltInDisplayCutout,

            true

        )

        underTest =

            FaceScanningProviderFactory(

                authController,

                displayContext,

                statusBarStateController,

                keyguardUpdateMonitor,

                mock(Executor::class.java),

                ScreenDecorationsLogger(logcatLogBuffer("FaceScanningProviderFactoryTest"))

            )



        whenever(authController.faceSensorLocation).thenReturn(Point(10, 10))

    }



    @Test

    fun shouldNotShowFaceScanningAnimationIfFaceIsNotEnrolled() {

        whenever(keyguardUpdateMonitor.isFaceEnrolled).thenReturn(false)

        whenever(authController.isShowing).thenReturn(true)



        assertThat(underTest.shouldShowFaceScanningAnim()).isFalse()

    }



    @Test

    fun shouldShowFaceScanningAnimationIfBiometricPromptIsShowing() {

        whenever(keyguardUpdateMonitor.isFaceEnrolled).thenReturn(true)

        whenever(authController.isShowing).thenReturn(true)



        assertThat(underTest.shouldShowFaceScanningAnim()).isTrue()

    }



    @Test

    fun shouldShowFaceScanningAnimationIfKeyguardFaceDetectionIsShowing() {

        whenever(keyguardUpdateMonitor.isFaceEnrolled).thenReturn(true)

        whenever(keyguardUpdateMonitor.isFaceDetectionRunning).thenReturn(true)



        assertThat(underTest.shouldShowFaceScanningAnim()).isTrue()

    }

}