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

Commit d233902b authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix ActivityTransitionTests" into main

parents dd2e259c 44e7c873

core/java/android/window/TransitionInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ public final class TransitionInfo implements Parcelable { 
        private final Rect mTransitionBounds = new Rect();

        private HardwareBuffer mThumbnail;

        private int mAnimations;

        // TODO(b/295805497): Extract it from AnimationOptions

        // TODO(b/295805497): Extract mBackgroundColor from AnimationOptions

        private @ColorInt int mBackgroundColor;

        // Customize activity transition animation

        private CustomActivityTransition mCustomActivityOpenTransition;

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

+2 −0
Original line number Diff line number Diff line
@@ -1895,6 +1895,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            for (int i = changes.size() - 1; i >= 0; --i) {

                if (mTargets.get(i).mContainer.asActivityRecord() != null) {

                    changes.get(i).setAnimationOptions(mOverrideOptions);

                    // TODO(b/295805497): Extract mBackgroundColor from AnimationOptions.

                    changes.get(i).setBackgroundColor(mOverrideOptions.getBackgroundColor());

                }

            }

        }