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

Commit c652f395 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Respect bar transition delay of remote animation" into tm-qpr-dev am:... 

Merge "Respect bar transition delay of remote animation" into tm-qpr-dev am: 626db83c am: cdfc1e6f

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



Change-Id: I0fb942dc83e258affad2976da407852218172f4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4700723 cdfc1e6f

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -4752,6 +4752,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (mPendingRemoteAnimation != null) {

        if (mPendingRemoteAnimation != null) {

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(

            mDisplayContent.mAppTransition.overridePendingAppTransitionRemote(

                    mPendingRemoteAnimation);

                    mPendingRemoteAnimation);

            mTransitionController.setStatusBarTransitionDelay(

                    mPendingRemoteAnimation.getStatusBarTransitionDelay());

        } else {

        } else {

            if (mPendingOptions == null

            if (mPendingOptions == null

                    || mPendingOptions.getAnimationType() == ANIM_SCENE_TRANSITION) {

                    || mPendingOptions.getAnimationType() == ANIM_SCENE_TRANSITION) {

services/core/java/com/android/server/wm/Transition.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -199,6 +199,9 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
    private boolean mNavBarAttachedToApp = false;

    private boolean mNavBarAttachedToApp = false;

    private int mRecentsDisplayId = INVALID_DISPLAY;

    private int mRecentsDisplayId = INVALID_DISPLAY;





    /** The delay for light bar appearance animation. */

    long mStatusBarTransitionDelay;



    /** @see #setCanPipOnFinish */

    /** @see #setCanPipOnFinish */

    private boolean mCanPipOnFinish = true;

    private boolean mCanPipOnFinish = true;
@@ -871,7 +874,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
        }

        }

        buildFinishTransaction(mFinishTransaction, info.getRootLeash());

        buildFinishTransaction(mFinishTransaction, info.getRootLeash());

        if (mController.getTransitionPlayer() != null) {

        if (mController.getTransitionPlayer() != null) {

            mController.dispatchLegacyAppTransitionStarting(info);

            mController.dispatchLegacyAppTransitionStarting(info, mStatusBarTransitionDelay);

            try {

            try {

                ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                        "Calling onTransitionReady: %s", info);

                        "Calling onTransitionReady: %s", info);

services/core/java/com/android/server/wm/TransitionController.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -462,6 +462,12 @@ class TransitionController { 
        }, true /* traverseTopToBottom */);

        }, true /* traverseTopToBottom */);

    }

    }





    /** @see Transition#mStatusBarTransitionDelay */

    void setStatusBarTransitionDelay(long delay) {

        if (mCollectingTransition == null) return;

        mCollectingTransition.mStatusBarTransitionDelay = delay;

    }



    /** @see Transition#setOverrideAnimation */

    /** @see Transition#setOverrideAnimation */

    void setOverrideAnimation(TransitionInfo.AnimationOptions options,

    void setOverrideAnimation(TransitionInfo.AnimationOptions options,

            @Nullable IRemoteCallback startCallback, @Nullable IRemoteCallback finishCallback) {

            @Nullable IRemoteCallback startCallback, @Nullable IRemoteCallback finishCallback) {
@@ -600,13 +606,14 @@ class TransitionController { 
        }

        }

    }

    }





    void dispatchLegacyAppTransitionStarting(TransitionInfo info) {

    void dispatchLegacyAppTransitionStarting(TransitionInfo info, long statusBarTransitionDelay) {

        final boolean keyguardGoingAway = info.isKeyguardGoingAway();

        final boolean keyguardGoingAway = info.isKeyguardGoingAway();

        for (int i = 0; i < mLegacyListeners.size(); ++i) {

        for (int i = 0; i < mLegacyListeners.size(); ++i) {

            // TODO(shell-transitions): handle (un)occlude transition.

            // TODO(shell-transitions): handle (un)occlude transition.

            mLegacyListeners.get(i).onAppTransitionStartingLocked(keyguardGoingAway,

            mLegacyListeners.get(i).onAppTransitionStartingLocked(keyguardGoingAway,

                    false /* keyguardOcclude */, 0 /* durationHint */,

                    false /* keyguardOcclude */, 0 /* durationHint */,

                    SystemClock.uptimeMillis(), AnimationAdapter.STATUS_BAR_TRANSITION_DURATION);

                    SystemClock.uptimeMillis() + statusBarTransitionDelay,

                    AnimationAdapter.STATUS_BAR_TRANSITION_DURATION);

        }

        }

    }

    }