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

Commit b9dd493b authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[flexiglass] Fixes SideFpsOverlayViewModel when flexi is on 

The sample wasn't working if the showIndicatorForDeviceEntry was
updating dynamically (as it does when flexiglass is on).

This was causing SideFpsOverlayViewModelTest to fail when flexiglass is
on

Bug: 283121968
Test: SideFpsOverlayViewModelTest passes locally now
Flag: com.android.systemui.scene_container
Change-Id: Ieeb5ba6ddd5ef44bca7bf7b432c5d0ab28317caf
parent eff62089

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

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.biometrics.shared.model.LottieCallback 
import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyguard.domain.interactor.DeviceEntrySideFpsOverlayInteractor

import com.android.systemui.res.R

import com.android.systemui.util.kotlin.sample

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.MutableStateFlow
@@ -153,7 +152,7 @@ constructor( 


    /** List of LottieCallbacks use for adding dynamic color to the overlayView */

    val lottieCallbacks: Flow<List<LottieCallback>> =

        _lottieBounds.sample(deviceEntrySideFpsOverlayInteractor.showIndicatorForDeviceEntry) {

        combine(_lottieBounds, deviceEntrySideFpsOverlayInteractor.showIndicatorForDeviceEntry) {

            _,

            showIndicatorForDeviceEntry: Boolean ->

            val callbacks = mutableListOf<LottieCallback>()