From 60f1fb663c9e31404ff0ac258bdd78614b2a9617 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Wed, 19 Apr 2023 11:34:21 +0000 Subject: [PATCH] Fix unlock transition double offset nested tasks Use parent-based position to prevent nested tasks being offsetted unexpectedly with screen-based position when performing unlock transition. Fix: 278282153 Test: http://recall/-/fLARJNt42LVxc3tt86SneW/b9gvDwL12TaDaLEkH4tUCS Change-Id: Ib95230742a52e0a9d6b2b1f791a11eec628b179b --- .../systemui/keyguard/KeyguardUnlockAnimationController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt index 9ab2e99225317..2d1b7ae610c09 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt @@ -791,7 +791,7 @@ class KeyguardUnlockAnimationController @Inject constructor( // Translate up from the bottom. surfaceBehindMatrix.setTranslate( - surfaceBehindRemoteAnimationTarget.screenSpaceBounds.left.toFloat(), + surfaceBehindRemoteAnimationTarget.localBounds.left.toFloat(), surfaceHeight * SURFACE_BEHIND_START_TRANSLATION_Y * (1f - amount) )