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

Commit caa37348 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Use ConfigurationInteractor instead of repository directly" into main

parents fca0ad15 74ac8a8d

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

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package com.android.systemui.keyguard.ui.viewmodel 
import android.content.Context

import com.android.settingslib.Utils

import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor

import com.android.systemui.common.ui.data.repository.ConfigurationRepository

import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -41,7 +41,7 @@ class DeviceEntryForegroundViewModel 
@Inject

constructor(

    val context: Context,

    configurationRepository: ConfigurationRepository, // TODO (b/309655554): create & use interactor

    configurationInteractor: ConfigurationInteractor,

    deviceEntryUdfpsInteractor: DeviceEntryUdfpsInteractor,

    transitionInteractor: KeyguardTransitionInteractor,

    deviceEntryIconViewModel: DeviceEntryIconViewModel,
@@ -62,7 +62,7 @@ constructor( 


    private val color: Flow<Int> =

        deviceEntryIconViewModel.useBackgroundProtection.flatMapLatest { useBgProtection ->

            configurationRepository.onAnyConfigurationChange

            configurationInteractor.onAnyConfigurationChange

                .map { getColor(useBgProtection) }

                .onStart { emit(getColor(useBgProtection)) }

        }

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DeviceEntryFgIconViewModelKosmos.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.keyguard.ui.viewmodel 


import android.content.applicationContext

import com.android.systemui.biometrics.domain.interactor.udfpsOverlayInteractor

import com.android.systemui.common.ui.data.repository.configurationRepository

import com.android.systemui.common.ui.domain.interactor.configurationInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceEntryUdfpsInteractor

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

import com.android.systemui.kosmos.Kosmos
@@ -29,7 +29,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi 
val Kosmos.deviceEntryForegroundIconViewModel by Fixture {

    DeviceEntryForegroundViewModel(

        context = applicationContext,

        configurationRepository = configurationRepository,

        configurationInteractor = configurationInteractor,

        deviceEntryUdfpsInteractor = deviceEntryUdfpsInteractor,

        transitionInteractor = keyguardTransitionInteractor,

        deviceEntryIconViewModel = deviceEntryIconViewModel,