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

Commit 2c6a6e22 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Add support for DeviceEntryIcon: Occluded transitions 

Previously they weren't added to the DeviceEntryIconTransitionModule
so they were never actually used by the DeviceEntryIconViewModel.

Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor TEAMFOOD
Test: manually press power button twice from screen off or AOD. On the
camera app, take a picture and notice no fingerprint reader prevents
picture from being taken.
Fixes: 328987912

Change-Id: I86e4aeadc30fa828b4be74bae2cc329bca6f5106
parent 4127d641

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt

+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(