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

Commit 69970a03 authored by Austin Delgado's avatar Austin Delgado
Browse files

Update biometric prompt colors 

Updates colors for biometric prompt icon and sfps indicator to match device theme.

Bug: 389744739
Flag: com.android.systemui.bp_colors
Test: atest com.android.systemui.biometrics
Test: atest SfpsOverlayViewModelTest

Change-Id: I35ada52a0b0a24125899b67abbbad7a606c57b18
parent cc373044

packages/SystemUI/aconfig/biometrics_framework.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ container: "system" 


# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.



flag {

    name: "bp_colors"

    namespace: "biometrics_framework"

    description: "Updates colors in biometric prompt"

    bug: "389744739"

}



flag {

    name: "cont_auth_plugin"

    namespace: "biometrics_framework"

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

+36 −9
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.graphics.Color 
import android.graphics.Rect

import android.hardware.biometrics.SensorLocationInternal

import android.hardware.display.DisplayManagerGlobal

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.view.Display

import android.view.DisplayInfo

import android.view.WindowInsets
@@ -30,6 +32,7 @@ import android.view.windowManager 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.airbnb.lottie.model.KeyPath

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider

import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository
@@ -76,15 +79,18 @@ class SideFpsOverlayViewModelTest : SysuiTestCase() { 


    private val contextDisplayInfo = DisplayInfo()



    private val indicatorColor = context.getColor(

            com.android.internal.R.color.materialColorPrimaryFixed,

        )

    private val outerRimColor = context.getColor(

            com.android.internal.R.color.materialColorPrimaryFixedDim,

        )

    private val chevronFill = context.getColor(

            com.android.internal.R.color.materialColorOnPrimaryFixed,

        )

    private val indicatorColor =

        context.getColor(com.android.internal.R.color.materialColorPrimaryFixed)

    private val outerRimColor =

        context.getColor(com.android.internal.R.color.materialColorPrimaryFixedDim)

    private val chevronFill =

        context.getColor(com.android.internal.R.color.materialColorOnPrimaryFixed)

    private val dynamicIndicatorColor =

        context.getColor(com.android.internal.R.color.materialColorPrimary)

    private val dynamicOuterRimColor =

        context.getColor(com.android.internal.R.color.materialColorPrimary)

    private val dynamicChevronFill =

        context.getColor(com.android.internal.R.color.materialColorOnPrimary)

    private val color_blue400 =

        context.getColor(com.android.settingslib.color.R.color.settingslib_color_blue400)
@@ -269,6 +275,7 @@ class SideFpsOverlayViewModelTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_BP_COLORS)

    fun updatesLottieCallbacks_onShowIndicatorForDeviceEntry() {

        kosmos.testScope.runTest {

            val lottieCallbacks by collectLastValue(kosmos.sideFpsOverlayViewModel.lottieCallbacks)
@@ -286,6 +293,25 @@ class SideFpsOverlayViewModelTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_BP_COLORS)

    fun updatesLottieCallbacks_dynamicSfps() {

        kosmos.testScope.runTest {

            val lottieCallbacks by collectLastValue(kosmos.sideFpsOverlayViewModel.lottieCallbacks)



            updateSfpsIndicatorRequests(kosmos, mContext, primaryBouncerRequest = true)

            runCurrent()



            assertThat(lottieCallbacks)

                .contains(LottieCallback(KeyPath(".blue600", "**"), dynamicIndicatorColor))

            assertThat(lottieCallbacks)

                .contains(LottieCallback(KeyPath(".blue400", "**"), dynamicOuterRimColor))

            assertThat(lottieCallbacks)

                .contains(LottieCallback(KeyPath(".black", "**"), dynamicChevronFill))

        }

    }



    @Test

    @DisableFlags(Flags.FLAG_BP_COLORS)

    fun updatesLottieCallbacks_onShowIndicatorForSystemServer_inDarkMode() {

        kosmos.testScope.runTest {

            val lottieCallbacks by collectLastValue(kosmos.sideFpsOverlayViewModel.lottieCallbacks)
@@ -302,6 +328,7 @@ class SideFpsOverlayViewModelTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_BP_COLORS)

    fun updatesLottieCallbacks_onShowIndicatorForSystemServer_inLightMode() {

        kosmos.testScope.runTest {

            val lottieCallbacks by collectLastValue(kosmos.sideFpsOverlayViewModel.lottieCallbacks)

packages/SystemUI/res/raw/biometricprompt_sfps_error_to_fingerprint.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/raw/biometricprompt_sfps_error_to_fingerprint_180.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/raw/biometricprompt_sfps_error_to_fingerprint_270.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.