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

Commit 44e7c873 authored by Charles Chen's avatar Charles Chen
Browse files

Fix ActivityTransitionTests 

We miss to set background color when there's an override
AnimationOptions.

Test: atest ActivityTransitionTests
Bug: 295805497
Flag: EXEMPT bugfix
Change-Id: I12de76554dc43c55fc81087843f1c0b255d7c41e
parent 0e03b064

core/java/android/window/TransitionInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,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
@@ -1893,6 +1893,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());

                }

            }

        }