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

Commit 52b4c777 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Remove keyguard state from onAnimationCancelled" into udc-dev

parents 4f823ca9 7e559492

quickstep/src/com/android/launcher3/LauncherAnimationRunner.java

+4 −8
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class LauncherAnimationRunner extends RemoteAnimationRunnerCompat { 
     */

    @BinderThread

    @Override

    public void onAnimationCancelled(boolean isKeyguardOccluded) {

    public void onAnimationCancelled() {

        postAsyncCallback(mHandler, () -> {

            finishExistingAnimation();

            getFactory().onAnimationCancelled();
@@ -235,16 +235,12 @@ public class LauncherAnimationRunner extends RemoteAnimationRunnerCompat { 
                RemoteAnimationTarget[] nonAppTargets,

                LauncherAnimationRunner.AnimationResult result);



        @Override

        @UiThread

        default void onAnimationCancelled(boolean isKeyguardOccluded) {

            onAnimationCancelled();

        }



        /**

         * Called when the animation is cancelled. This can happen with or without

         * the create being called.

         */

        @Override

        @UiThread

        default void onAnimationCancelled() {}

    }

}

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1841,8 +1841,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        }



        @Override

        public void onAnimationCancelled(boolean isKeyguardOccluded) {

            mDelegate.onAnimationCancelled(isKeyguardOccluded);

        public void onAnimationCancelled() {

            mDelegate.onAnimationCancelled();

        }

    }

quickstep/src/com/android/quickstep/LauncherBackAnimationController.java

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class LauncherBackAnimationController { 
            }



            @Override

            public void onAnimationCancelled(boolean isKeyguardOccluded) {}

            public void onAnimationCancelled() {}

        };



        SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, runner);

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ public class SplitSelectStateController { 
        }



        @Override

        public void onAnimationCancelled(boolean isKeyguardOccluded) {

        public void onAnimationCancelled() {

            postAsyncCallback(mHandler, () -> {

                if (mSuccessCallback != null) {

                    // Launching legacy tasks while recents animation is running will always cause