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

Commit c4d93dce authored by Beverly's avatar Beverly
Browse files

Add AlternateBouncer support as its own view. 

The AlternateBouncer view lives in super_notification_shade so that
it can show over the shade and other keyguard root views. The
alternate bouncer will show its own udfps UI (if the device
supports UDFPS).

Update TransitionViewModels to transition to and from the alternate
bouncer state correctly.

Update burn-in offsets logic.

Test: atest AlternateBouncerInteractorTest AlternateBouncerToGoneTransitionViewModelTest
AlternateBouncerToAodTransitionViewModelTest DeviceEntryUdfpsTouchOverlayViewModelTest
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT
Bug: 287599719

Change-Id: I835370dfc484d29a232f1447ba2fc5e4064d940e
parent a3a17cad

packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -32,18 +32,15 @@ import com.android.systemui.statusbar.policy.KeyguardStateController 
import com.android.systemui.util.mockito.whenever

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

import com.android.systemui.util.time.SystemClock

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.TestScope

import org.junit.Assert.assertFalse

import org.junit.Assert.assertTrue

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.MockitoAnnotations



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

class AlternateBouncerInteractorTest : SysuiTestCase() {
@@ -167,7 +164,6 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { 
    }



    @Test

    @Ignore("b/287599719")

    fun canShowAlternateBouncerForFingerprint_rearFps() {

        mSetFlagsRule.enableFlags(Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR)

        initializeUnderTest()

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToAodTransitionViewModelTest.kt

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

 * Copyright (C) 2022 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.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.biometrics.shared.model.FingerprintSensorType

import com.android.systemui.biometrics.shared.model.SensorStrength

import com.android.systemui.coroutines.collectValues

import com.android.systemui.keyguard.data.repository.biometricSettingsRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.KeyguardState.AOD

import com.android.systemui.keyguard.shared.model.TransitionState

import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING

import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.google.common.collect.Range

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class AlternateBouncerToAodTransitionViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository

    private val biometricSettingsRepository = kosmos.biometricSettingsRepository

    private val underTest = kosmos.alternateBouncerToAodTransitionViewModel



    @Test

    fun deviceEntryParentViewAppear() =

        testScope.runTest {

            fingerprintPropertyRepository.setProperties(

                sensorId = 0,

                strength = SensorStrength.STRONG,

                sensorType = FingerprintSensorType.UDFPS_OPTICAL,

                sensorLocations = emptyMap(),

            )

            biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true)

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(1f) }

        }



    @Test

    fun deviceEntryBackgroundViewDisappear() =

        testScope.runTest {

            val values by collectValues(underTest.deviceEntryBackgroundViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            assertThat(values.size).isEqualTo(6)

            values.forEach { assertThat(it).isIn(Range.closed(0f, 1f)) }

        }



    private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {

        return TransitionStep(

            from = KeyguardState.ALTERNATE_BOUNCER,

            to = AOD,

            value = value,

            transitionState = state,

            ownerName = "AlternateBouncerToAodTransitionViewModelTest"

        )

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToGoneTransitionViewModelTest.kt

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

 * Copyright (C) 2022 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.keyguard.ui.viewmodel



import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.KeyguardState.GONE

import com.android.systemui.keyguard.shared.model.TransitionState

import com.android.systemui.keyguard.shared.model.TransitionState.RUNNING

import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class AlternateBouncerToGoneTransitionViewModelTest : SysuiTestCase() {

    val kosmos =

        testKosmos().apply {

            fakeFeatureFlagsClassic.apply {

                set(Flags.REFACTOR_KEYGUARD_DISMISS_INTENT, false)

                set(Flags.FULL_SCREEN_USER_SWITCHER, false)

            }

        }

    private val testScope = kosmos.testScope

    private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    private val underTest = kosmos.alternateBouncerToGoneTransitionViewModel



    @Test

    fun deviceEntryParentViewDisappear() =

        testScope.runTest {

            val values by collectValues(underTest.deviceEntryParentViewAlpha)



            keyguardTransitionRepository.sendTransitionSteps(

                listOf(

                    step(0f, TransitionState.STARTED),

                    step(0f),

                    step(0.1f),

                    step(0.2f),

                    step(0.3f),

                    step(1f),

                ),

                testScope,

            )



            values.forEach { assertThat(it).isEqualTo(0f) }

        }



    private fun step(value: Float, state: TransitionState = RUNNING): TransitionStep {

        return TransitionStep(

            from = KeyguardState.ALTERNATE_BOUNCER,

            to = GONE,

            value = value,

            transitionState = state,

            ownerName = "AlternateBouncerToGoneTransitionViewModelTest"

        )

    }

}

packages/SystemUI/res-keyguard/layout/alternate_bouncer.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~

  -->



<FrameLayout

<androidx.constraintlayout.widget.ConstraintLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/alternate_bouncer"
@@ -32,4 +32,4 @@ 
        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />

</FrameLayout>
 
</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/layout/super_notification_shade.xml

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ 
        android:inflatedId="@+id/multi_shade"

        android:layout="@layout/multi_shade" />



    <include layout="@layout/alternate_bouncer"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <com.android.systemui.biometrics.AuthRippleView

        android:id="@+id/auth_ripple"

        android:layout_width="match_parent"