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

Commit f1234b41 authored by Josh Tsuji's avatar Josh Tsuji
Browse files

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
parent ccf3121e

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+1 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

                                }