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

Commit 2dae724f authored by Nick Chameyev's avatar Nick Chameyev Committed by Android (Google) Code Review
Browse files

Merge "[Folding to AOD] Do not delay keyguard show when folding"

parents 7315b727 a836e7d6
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -113,14 +113,16 @@ class ScreenOffAnimationController @Inject constructor(
     * the animation ends
     */
    fun shouldDelayKeyguardShow(): Boolean =
        animations.any { it.shouldPlayAnimation() }
        animations.any { it.shouldDelayKeyguardShow() }

    /**
     * Return true while we want to ignore requests to show keyguard, we need to handle pending
     * keyguard lock requests manually
     *
     * @see [com.android.systemui.keyguard.KeyguardViewMediator.maybeHandlePendingLock]
     */
    fun isKeyguardShowDelayed(): Boolean =
        animations.any { it.isAnimationPlaying() }
        animations.any { it.isKeyguardShowDelayed() }

    /**
     * Return true to ignore requests to hide keyguard
@@ -211,6 +213,8 @@ interface ScreenOffAnimation {
    fun shouldAnimateInKeyguard(): Boolean = false
    fun animateInKeyguard(keyguardView: View, after: Runnable) = after.run()

    fun shouldDelayKeyguardShow(): Boolean = false
    fun isKeyguardShowDelayed(): Boolean = false
    fun isKeyguardHideDelayed(): Boolean = false
    fun shouldHideScrimOnWakeUp(): Boolean = false
    fun overrideNotificationsDozeAmount(): Boolean = false
+6 −0
Original line number Diff line number Diff line
@@ -136,6 +136,12 @@ class UnlockedScreenOffAnimationController @Inject constructor(
                globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f)
    }

    override fun shouldDelayKeyguardShow(): Boolean =
        shouldPlayAnimation()

    override fun isKeyguardShowDelayed(): Boolean =
        isAnimationPlaying()

    /**
     * Animates in the provided keyguard view, ending in the same position that it will be in on
     * AOD.
+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.os.Handler
import android.os.PowerManager
import android.provider.Settings
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.keyguard.KeyguardViewMediator
import com.android.systemui.keyguard.WakefulnessLifecycle
import com.android.systemui.statusbar.LightRevealScrim
import com.android.systemui.statusbar.phone.ScreenOffAnimation
@@ -28,7 +27,6 @@ import com.android.systemui.statusbar.phone.StatusBar
import com.android.systemui.statusbar.policy.CallbackController
import com.android.systemui.unfold.FoldAodAnimationController.FoldAodAnimationStatus
import com.android.systemui.util.settings.GlobalSettings
import dagger.Lazy
import javax.inject.Inject

/**
@@ -40,7 +38,6 @@ class FoldAodAnimationController
@Inject
constructor(
    @Main private val handler: Handler,
    private val keyguardViewMediatorLazy: Lazy<KeyguardViewMediator>,
    private val wakefulnessLifecycle: WakefulnessLifecycle,
    private val globalSettings: GlobalSettings
) : CallbackController<FoldAodAnimationStatus>, ScreenOffAnimation, WakefulnessLifecycle.Observer {
@@ -57,7 +54,6 @@ constructor(
        statusBar.notificationPanelViewController.startFoldToAodAnimation {
            // End action
            isAnimationPlaying = false
            keyguardViewMediatorLazy.get().maybeHandlePendingLock()
        }
    }