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

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

Merge "Pass keyguard occlude state to onLaunchAnimationCancelled." into tm-qpr-dev am: 384756a6 

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



Change-Id: Id91fde14aed937c6ccefbecf4dd2345be3da81e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ca1b0e6 384756a6

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+5 −2
Original line number Diff line number Diff line
@@ -352,8 +352,11 @@ class ActivityLaunchAnimator( 
         * The animation was cancelled. Note that [onLaunchAnimationEnd] will still be called after

         * this if the animation was already started, i.e. if [onLaunchAnimationStart] was called

         * before the cancellation.

         *

         * If this launch animation affected the occlusion state of the keyguard, WM will provide

         * us with [newKeyguardOccludedState] so that we can set the occluded state appropriately.

         */

        fun onLaunchAnimationCancelled() {}

        fun onLaunchAnimationCancelled(newKeyguardOccludedState: Boolean? = null) {}

    }



    @VisibleForTesting
@@ -667,7 +670,7 @@ class ActivityLaunchAnimator( 
            removeTimeout()

            context.mainExecutor.execute {

                animation?.cancel()

                controller.onLaunchAnimationCancelled()

                controller.onLaunchAnimationCancelled(newKeyguardOccludedState = isKeyguardOccluded)

            }

        }

packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ constructor( 
                }

            }



            override fun onLaunchAnimationCancelled() {

            override fun onLaunchAnimationCancelled(newKeyguardOccludedState: Boolean?) {

                controller.onLaunchAnimationCancelled()

                enableDialogDismiss()

                dialog.dismiss()

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

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                public void onLaunchAnimationStart(boolean isExpandingFullyAbove) {}



                @Override

                public void onLaunchAnimationCancelled() {

                public void onLaunchAnimationCancelled(@Nullable Boolean newKeyguardOccludedState) {

                    Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "

                            + mOccluded);

                }

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationLaunchAnimatorController.kt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ class NotificationLaunchAnimatorController( 
        headsUpManager.removeNotification(notificationKey, true /* releaseImmediately */, animate)

    }



    override fun onLaunchAnimationCancelled() {

    override fun onLaunchAnimationCancelled(newKeyguardOccludedState: Boolean?) {

        // TODO(b/184121838): Should we call InteractionJankMonitor.cancel if the animation started

        // here?

        notificationShadeWindowViewController.setExpandAnimationRunning(false)

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+7 −2
Original line number Diff line number Diff line
@@ -1737,13 +1737,18 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                }



                @Override

                public void onLaunchAnimationCancelled() {

                public void onLaunchAnimationCancelled(@Nullable Boolean newKeyguardOccludedState) {

                    if (newKeyguardOccludedState != null) {

                        mKeyguardViewMediator.setOccluded(

                                newKeyguardOccludedState, false /* animate */);

                    }



                    // Set mIsLaunchingActivityOverLockscreen to false before actually finishing the

                    // animation so that we can assume that mIsLaunchingActivityOverLockscreen

                    // being true means that we will collapse the shade (or at least run the

                    // post collapse runnables) later on.

                    CentralSurfacesImpl.this.mIsLaunchingActivityOverLockscreen = false;

                    getDelegate().onLaunchAnimationCancelled();

                    getDelegate().onLaunchAnimationCancelled(newKeyguardOccludedState);

                }

            };

        } else if (dismissShade) {