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

Commit 0e0580b0 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: 88d5eb36

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



Change-Id: Ibc27ddd144e9a2ac97732cc6d269213e08e2980f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf5b12a6 88d5eb36

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

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

                        RemoteAnimationTarget[] wallpapers,

                        RemoteAnimationTarget[] nonApps,

                        RemoteAnimationTarget[] nonApps,

                        IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {

                        IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {

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



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

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

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

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

                                + "skipping animation and unoccluding.");

                                + "skipping animation and unoccluding.");



                        finishedCallback.onAnimationFinished();

                        finishedCallback.onAnimationFinished();

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

                        return;

                        return;

                    }

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

                            @Override

                            public void onAnimationEnd(Animator animation) {

                            public void onAnimationEnd(Animator animation) {

                                try {

                                try {

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

                                    finishedCallback.onAnimationFinished();

                                    finishedCallback.onAnimationFinished();

                                    mUnoccludeAnimator = null;

                                    mUnoccludeAnimator = null;

                                } catch (RemoteException e) {

                                } catch (RemoteException e) {