From f1234b41eebbae69affbc3b1359fa295b47c6688 Mon Sep 17 00:00:00 2001 From: Josh Tsuji Date: Fri, 25 Mar 2022 11:27:21 -0400 Subject: [PATCH] Re-enable remote occlude/unocclude animations. This was previously disabled due to an issue where the bouncer would appear whenever the home controls (or other non-camera occluding activites) were launched. This issue appears to now be fixed on tm-dev, likely by some of our other fixes over the last month. Bug: 202963722 Test: With AOD enabled/disabled Test: With security/no security/no lockscreen Test: enable home controls, use home controls activity Change-Id: I486c7adeb23113fa98377d1d5b16c8b6a8be003c --- .../src/com/android/systemui/keyguard/KeyguardService.java | 2 +- .../com/android/systemui/keyguard/KeyguardViewMediator.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 88555edd1e8b9..b96eee717260f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -102,7 +102,7 @@ public class KeyguardService extends Service { "persist.wm.enable_remote_keyguard_animation"; private static final int sEnableRemoteKeyguardAnimation = - SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 2); /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 197b7b43be716..55bb2aecd379b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -900,7 +900,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, * ActivityLaunchAnimator since we're just translating down, rather than emerging from a view * or the power button. */ - private IRemoteAnimationRunner mUnoccludeAnimationRunner = + private final IRemoteAnimationRunner mUnoccludeAnimationRunner = new IRemoteAnimationRunner.Stub() { @Nullable private ValueAnimator mUnoccludeAnimator; @@ -965,6 +965,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, public void onAnimationEnd(Animator animation) { try { finishedCallback.onAnimationFinished(); + mUnoccludeAnimator = null; } catch (RemoteException e) { e.printStackTrace(); }