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

Commit f9d664e0 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Unocclude immediately so that the surface animation is visible." into... 

Merge "Unocclude immediately so that the surface animation is visible." into tm-dev am: aa9e92c1 am: 2f6acab1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169504



Change-Id: Ieed0d58a6b2afa03e047aff2f666eaabd0aaa5c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43be4033 2f6acab1

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

+2 −3
Original line number Diff line number Diff line
@@ -911,12 +911,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                        RemoteAnimationTarget[] wallpapers,

                        RemoteAnimationTarget[] nonApps,

                        IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {

                    setOccluded(false /* isOccluded */, true /* animate */);



                    if (apps == null || apps.length == 0 || apps[0] == null) {

                        Log.d(TAG, "No apps provided to unocclude runner; "

                                + "skipping animation and unoccluding.");



                        finishedCallback.onAnimationFinished();

                        setOccluded(false /* isOccluded */, true /* animate */);

                        return;

                    }
@@ -961,7 +961,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                            @Override

                            public void onAnimationEnd(Animator animation) {

                                try {

                                    setOccluded(false /* isOccluded */, true /* animate */);

                                    finishedCallback.onAnimationFinished();

                                    mUnoccludeAnimator = null;

                                } catch (RemoteException e) {