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

Commit d79e1dc2 authored Mar 29, 2024 by Beverly Tai Committed by Android (Google) Code Review Mar 29, 2024

Merge "Make DeviceEntryIconViewModels singletons" into main

parents b730ef80 c52b673b

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package com.android.systemui.keyguard.ui.viewmodel
		import android.content.Context
		import com.android.settingslib.Utils
		import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import javax.inject.Inject
		@@ -34,6 +35,7 @@ import kotlinx.coroutines.flow.onStart
		/** Models the UI state for the device entry icon background view. */
		@Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
		@ExperimentalCoroutinesApi
		@SysUISingleton
		class DeviceEntryBackgroundViewModel
		@Inject
		constructor(

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Context
		import com.android.settingslib.Utils
		import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor
		import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.KeyguardState
		@@ -39,6 +40,7 @@ import kotlinx.coroutines.flow.onStart

		/** Models the UI state for the device entry icon foreground view (displayed icon). */
		@ExperimentalCoroutinesApi
		@SysUISingleton
		class DeviceEntryForegroundViewModel
		@Inject
		constructor(

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.keyguard.ui.viewmodel
		import android.animation.FloatEvaluator
		import android.animation.IntEvaluator
		import com.android.keyguard.KeyguardViewController
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntrySourceInteractor
		@@ -52,6 +53,7 @@ import kotlinx.coroutines.flow.shareIn

		/** Models the UI state for the containing device entry icon & long-press handling view. */
		@ExperimentalCoroutinesApi
		@SysUISingleton
		class DeviceEntryIconViewModel
		@Inject
		constructor(