diff options
| author | Pablo Gamito <pablogamito@google.com> | 2022-03-22 10:47:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-22 10:47:56 +0000 |
| commit | ace23e0e89925d0393c8a0362189a90b802ccbe8 (patch) | |
| tree | c5f2ba68347de5c81660127521dc93d8411aad8a /core/java/android | |
| parent | 658f0208f8cc4ae4d4a2cd060e074eba5654d237 (diff) | |
| parent | 98034d22c6aad6def94d4d0a04a54edbc4f82f4d (diff) | |
Merge "Read custom background when creating ActivityOptions from bundle" into tm-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 0178fa143445..0d8103675cc2 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -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; |