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

Commit 98034d22 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Read custom background when creating ActivityOptions from bundle 

Test: atest CtsWindowManagerDeviceTestCases:ActivityTransitionTests
Change-Id: I43f042678c5bea9d027552266ffb6c00ab92f3c0
parent db84899c

core/java/android/app/ActivityOptions.java

+1 −0
Original line number Diff line number Diff line
@@ -1154,6 +1154,7 @@ public class ActivityOptions extends ComponentOptions { 
            case ANIM_CUSTOM:

                mCustomEnterResId = opts.getInt(KEY_ANIM_ENTER_RES_ID, 0);

                mCustomExitResId = opts.getInt(KEY_ANIM_EXIT_RES_ID, 0);

                mCustomBackgroundColor = opts.getInt(KEY_ANIM_BACKGROUND_COLOR, 0);

                mAnimationStartedListener = IRemoteCallback.Stub.asInterface(

                        opts.getBinder(KEY_ANIM_START_LISTENER));

                break;

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

+2 −0
Original line number Diff line number Diff line
@@ -1305,6 +1305,8 @@ public class AppTransition implements Dump { 
            pw.print(Integer.toHexString(mNextAppTransitionEnter));

            pw.print(" mNextAppTransitionExit=0x");

            pw.println(Integer.toHexString(mNextAppTransitionExit));

            pw.print(" mNextAppTransitionBackgroundColor=0x");

            pw.println(Integer.toHexString(mNextAppTransitionBackgroundColor));

        }

        switch (mNextAppTransitionType) {

            case NEXT_TRANSIT_TYPE_CUSTOM_IN_PLACE: