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

Commit 6a3246f0 authored by Matt Pietal's avatar Matt Pietal
Browse files

Cleanup - Remove invalid onStart 

The animation onStart() is a side-effecting function, returning
Unit. Attempting to return a value here is invalid.

Bug: 322198222
Test: atest com.android.systemui.keyguard
Flag: ACONFIG com.android.systemui.keyguard_shade_migration_nssl
STAGING
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
DEVELOPMENT
Flag: ACONFIG com.android.systemui.keyguard_bottom_area_refactor
STAGING

Change-Id: Ic8ecf64c31918cc41e7533bf5c646adb8f6674fc
parent b47b88de

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ constructor( 
    /**

     * When the lockscreen can be dismissed, emit an alpha value as the user swipes up. This is

     * useful just before the code commits to moving to GONE.

     *

     * This uses legacyShadeExpansion to process swipe up events. In the future, the touch input

     * signal should be sent directly to transitions.

     */

    val dismissAlpha: Flow<Float?> =

        combine(

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

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ constructor( 
    override val deviceEntryParentViewAlpha: Flow<Float> =

        transitionAnimation.sharedFlow(

            duration = 500.milliseconds,

            onStart = { 1f },

            onStep = { 1f },

        )

}

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

+0 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ constructor( 
        return transitionAnimation.sharedFlowWithState(

            startTime = 600.milliseconds,

            duration = 500.milliseconds,

            onStart = { translatePx },

            onStep = { translatePx + it * -translatePx },

            onFinish = { 0f },

            onCancel = { 0f },
@@ -66,7 +65,6 @@ constructor( 
        transitionAnimation.sharedFlow(

            startTime = 700.milliseconds,

            duration = 400.milliseconds,

            onStart = { 0f },

            onStep = { it },

            onFinish = { 1f },

            onCancel = { 1f },

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

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ constructor( 
            startTime = 233.milliseconds,

            duration = 250.milliseconds,

            onStep = { it },

            onStart = { 0f },

        )



    override val deviceEntryParentViewAlpha: Flow<Float> =

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

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ constructor( 
            startTime = 233.milliseconds,

            duration = 250.milliseconds,

            onStep = { it },

            onStart = { 0f },

            name = "OCCLUDED->LOCKSCREEN: lockscreenAlpha",

        )