summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brad Hinegardner <bhinegardner@google.com> 2024-01-22 17:52:15 +0000
committer Brad Hinegardner <bhinegardner@google.com> 2024-01-22 17:52:15 +0000
commita68f5024b26073d220f8aa7c914e109c4f8b7ef3 (patch)
tree809f6c86575ad7490c505e3a37a549a97becb635
parent6969fe070336d5f39616dba8eadd104617d1d852 (diff)
Remove blueprints delayedTransition
The delayed transition was animating all elements unless excluded, which we may not want right now. More robust transitions between blueprints are not using this anyways, and this was causing some unwanted translation animations. Fixes: 320736160 Flag: ACONFIG com.android.systemui.keyguard_bottom_area_refactor STAGING Test: manual - unfold and fold device on lockscreen and observe no lock icon or indication text animation Change-Id: I89df0570d9be4583086c2242280b2a4899110c71
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt
index 3dd3e0762c7c..8d6493f9a278 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBlueprintViewBinder.kt
@@ -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()