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

Commit 211eac41 authored by Austin Delgado's avatar Austin Delgado
Browse files

Update BP to dismiss when shade is interacted with 

Test: AuthContainerViewTest
Bug: 422322086
Flag: EXEMPT bugfix
Change-Id: I354f03237c643a13617579acdddbde745a05545f
parent 743bc3d4

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.systemui.jank.interactionJankMonitor 
import com.android.systemui.keyguard.wakefulnessLifecycle

import com.android.systemui.keyguard.wakefulnessLifecycle

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.testScope

import com.android.systemui.res.R

import com.android.systemui.res.R

import com.android.systemui.shade.data.repository.fakeShadeRepository

import com.android.systemui.testKosmos

import com.android.systemui.testKosmos

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

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

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runCurrent
@@ -97,6 +98,7 @@ open class AuthContainerViewTest : SysuiTestCase() { 




    private val testScope = kosmos.testScope

    private val testScope = kosmos.testScope

    private val fakeExecutor = kosmos.fakeExecutor

    private val fakeExecutor = kosmos.fakeExecutor

    private val fakeShadeRepository = kosmos.fakeShadeRepository





    private val defaultLogoIcon = context.getDrawable(R.drawable.ic_android)

    private val defaultLogoIcon = context.getDrawable(R.drawable.ic_android)
@@ -152,7 +154,7 @@ open class AuthContainerViewTest : SysuiTestCase() { 
    }

    }





    @Test

    @Test

    fun testDismissOnShadeDown() {

    fun testDismissOnShadeInteraction() {

        val container = initializeFingerprintContainer(addToView = true)

        val container = initializeFingerprintContainer(addToView = true)

        assertThat(container.parent).isNotNull()

        assertThat(container.parent).isNotNull()

        val root = container.rootView

        val root = container.rootView

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -305,8 +305,8 @@ object BiometricViewBinder { 
                }

                }





                launch {

                launch {

                    viewModel.isShadeExpanded.collect { isShadeExpanded ->

                    viewModel.isShadeInteracted.collect { isShadeInteracted ->

                        if (isShadeExpanded) {

                        if (isShadeInteracted) {

                            legacyCallback.onUserCanceled()

                            legacyCallback.onUserCanceled()

                        }

                        }

                    }

                    }

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/CredentialViewBinder.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -147,8 +147,8 @@ object CredentialViewBinder { 
                }

                }





                launch {

                launch {

                    viewModel.isShadeExpanded.collect { isShadeExpanded ->

                    viewModel.isShadeInteracted.collect { isShadeInteracted ->

                        if (isShadeExpanded) {

                        if (isShadeInteracted) {

                            host.onCredentialAborted()

                            host.onCredentialAborted()

                        }

                        }

                    }

                    }

packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModel.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,8 @@ constructor( 
            }

            }

        }

        }





    /** Whether the shade is expanded */

    /** Whether the shade is being interacted with */

    val isShadeExpanded = shadeInteractor.isShadeAnyExpanded

    val isShadeInteracted = shadeInteractor.isUserInteracting





    /** Input flags for text based credential views */

    /** Input flags for text based credential views */

    val inputFlags: Flow<Int?> =

    val inputFlags: Flow<Int?> =

packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -112,8 +112,8 @@ constructor( 
            .map { it?.modalities ?: BiometricModalities() }

            .map { it?.modalities ?: BiometricModalities() }

            .distinctUntilChanged()

            .distinctUntilChanged()





    /** Whether the shade is expanded */

    /** Whether the shade is being interacted with */

    val isShadeExpanded = shadeInteractor.isShadeAnyExpanded

    val isShadeInteracted = shadeInteractor.isUserInteracting





    val udfpsAccessibilityOverlayViewModel =

    val udfpsAccessibilityOverlayViewModel =

        BiometricPromptUdfpsAccessibilityOverlayViewModel(

        BiometricPromptUdfpsAccessibilityOverlayViewModel(