Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Read custom background when creating ActivityOptions from bundle" into tm-dev

Browse Source
This commit is contained in:
Pablo Gamito
2022-03-22 10:47:56 +00:00
committed by Android (Google) Code Review
parent 658f0208f8 98034d22c6
commit ace23e0e89
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/app/ActivityOptions.java
View File

@@ -1162,6 +1162,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;

2
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -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: