From eb8abf7207aa118065999514f9248affbdd94de1 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Wed, 2 Jul 2014 15:04:09 -0700 Subject: Introduce onNewActivityOptions for return activity When an activity that is already translucent returns to the previous activity using a scene transition the receiving activity did not receive its ActivityOptions for its side of the animation. The new method onNewActivityOptions() delivers those options. Fixes bug 14869070. Change-Id: I09b136b3213aae5d3521894e17a7500ac793f3d2 --- core/java/android/app/Activity.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'core/java/android/app/Activity.java') diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 228d82ef958c..28498ec7eeaa 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5284,6 +5284,14 @@ public class Activity extends ContextThemeWrapper } } + /** @hide */ + public void onNewActivityOptions(ActivityOptions options) { + mActivityTransitionState.setEnterActivityOptions(this, options); + if (!mStopped) { + mActivityTransitionState.enterReady(this); + } + } + /** * Retrieve the ActivityOptions passed in from the launching activity or passed back * from an activity launched by this activity in its call to {@link -- cgit v1.2.3