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

Commit 9bbc5ba4 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge "Remove blueprints delayedTransition" into main

parents c61edb0d a68f5024
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.repeatOnLifecycle
import com.android.systemui.Flags.keyguardBottomAreaRefactor
import com.android.systemui.keyguard.ui.view.layout.blueprints.transitions.BaseBlueprintTransition
import com.android.systemui.keyguard.ui.viewmodel.KeyguardBlueprintViewModel
import com.android.systemui.lifecycle.repeatWhenAttached
@@ -53,7 +54,8 @@ class KeyguardBlueprintViewBinder {
                                }

                            // Apply transition.
                            if (prevBluePrint != null && prevBluePrint != blueprint) {
                            if (!keyguardBottomAreaRefactor() && prevBluePrint != null &&
                                prevBluePrint != blueprint) {
                                TransitionManager.beginDelayedTransition(
                                    constraintLayout,
                                    BaseBlueprintTransition()