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

Commit b8f82c1a authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Improve transition logging" into udc-dev

parents 0925af1e 8869bb5f

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

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        ActivityOptions options = ActivityOptions.makeRemoteAnimation(

                new RemoteAnimationAdapter(runner, duration, statusBarTransitionDelay),

                new RemoteTransition(runner.toRemoteTransition(),

                        mLauncher.getIApplicationThread()));

                        mLauncher.getIApplicationThread(), "QuickstepLaunch"));

        return new ActivityOptionsWrapper(options, onEndCallback);

    }
@@ -1122,7 +1122,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            mLauncherOpenTransition = new RemoteTransition(

                    new LauncherAnimationRunner(mHandler, mWallpaperOpenTransitionRunner,

                            false /* startAtFrontOfQueue */).toRemoteTransition(),

                    mLauncher.getIApplicationThread());

                    mLauncher.getIApplicationThread(), "QuickstepLaunchHome");



            TransitionFilter homeCheck = new TransitionFilter();

            // No need to handle the transition that also dismisses keyguard.

quickstep/src/com/android/quickstep/RecentsActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
                new RemoteAnimationAdapter(wrapper, RECENTS_LAUNCH_DURATION,

                        RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION

                                - STATUS_BAR_TRANSITION_PRE_DELAY),

                new RemoteTransition(wrapper.toRemoteTransition(), getIApplicationThread()));

                new RemoteTransition(wrapper.toRemoteTransition(), getIApplicationThread(),

                        "LaunchFromRecents"));

        final ActivityOptionsWrapper activityOptions = new ActivityOptionsWrapper(options,

                onEndCallback);

        activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
@@ -405,7 +406,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
                getMainThreadHandler(), mAnimationToHomeFactory, true);

        ActivityOptions options = ActivityOptions.makeRemoteAnimation(

                new RemoteAnimationAdapter(runner, HOME_APPEAR_DURATION, 0),

                new RemoteTransition(runner.toRemoteTransition(), getIApplicationThread()));

                new RemoteTransition(runner.toRemoteTransition(), getIApplicationThread(),

                        "StartHomeFromRecents"));

        startHomeIntentSafely(this, options.toBundle());

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ public class SplitSelectStateController { 
            final RemoteSplitLaunchTransitionRunner animationRunner =

                    new RemoteSplitLaunchTransitionRunner(taskId1, taskId2, callback);

            final RemoteTransition remoteTransition = new RemoteTransition(animationRunner,

                    ActivityThread.currentActivityThread().getApplicationThread());

                    ActivityThread.currentActivityThread().getApplicationThread(),

                    "LaunchSplitPair");

            if (intent1 == null && intent2 == null) {

                mSystemUiProxy.startTasks(taskId1, options1.toBundle(), taskId2,

                        null /* options2 */, stagePosition, splitRatio, remoteTransition,