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
This commit is contained in:
Josh Tsuji
2022-03-25 11:27:21 -04:00
parent ccf3121eb1
commit f1234b41ee
2 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -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();
}