From 98034d22c6aad6def94d4d0a04a54edbc4f82f4d Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Thu, 3 Mar 2022 16:51:35 +0100 Subject: [PATCH] Read custom background when creating ActivityOptions from bundle Test: atest CtsWindowManagerDeviceTestCases:ActivityTransitionTests Change-Id: I43f042678c5bea9d027552266ffb6c00ab92f3c0 --- core/java/android/app/ActivityOptions.java | 1 + services/core/java/com/android/server/wm/AppTransition.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 5ddaa80b1a825..4056324d72f83 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -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; diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index 05efb29cc775c..f708a7fa5bb9d 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -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: