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

Commit 132d71b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add support for DeviceEntryIcon: Occluded transitions" into main

parents 672ff955 2c6a6e22
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToGoneTransiti
import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.AodToOccludedTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.DozingToGoneTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.DozingToLockscreenTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.DozingToOccludedTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.DozingToPrimaryBouncerTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel
import com.android.systemui.keyguard.ui.viewmodel.GoneToAodTransitionViewModel
@@ -71,6 +73,10 @@ abstract class DeviceEntryIconTransitionModule {
        impl: AlternateBouncerToPrimaryBouncerTransitionViewModel
    ): DeviceEntryIconTransition

    @Binds
    @IntoSet
    abstract fun aodToGone(impl: AodToGoneTransitionViewModel): DeviceEntryIconTransition

    @Binds
    @IntoSet
    abstract fun aodToLockscreen(
@@ -79,7 +85,7 @@ abstract class DeviceEntryIconTransitionModule {

    @Binds
    @IntoSet
    abstract fun aodToGone(impl: AodToGoneTransitionViewModel): DeviceEntryIconTransition
    abstract fun aodToOccluded(impl: AodToOccludedTransitionViewModel): DeviceEntryIconTransition

    @Binds
    @IntoSet
@@ -91,6 +97,12 @@ abstract class DeviceEntryIconTransitionModule {
        impl: DozingToLockscreenTransitionViewModel
    ): DeviceEntryIconTransition

    @Binds
    @IntoSet
    abstract fun dozingToOccluded(
        impl: DozingToOccludedTransitionViewModel
    ): DeviceEntryIconTransition

    @Binds
    @IntoSet
    abstract fun dozingToPrimaryBouncer(