diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Fragment.java | 18 | ||||
| -rw-r--r-- | core/java/android/app/SharedElementCallback.java | 4 |
2 files changed, 18 insertions, 4 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 4374622..a95abab 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -1628,7 +1628,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene * @param callback Used to manipulate the shared element transitions on this Fragment * when added not as a pop from the back stack. */ - public void setEnterSharedElementTransitionCallback(SharedElementCallback callback) { + public void setEnterSharedElementCallback(SharedElementCallback callback) { if (callback == null) { callback = SharedElementCallback.NULL_CALLBACK; } @@ -1636,13 +1636,20 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene } /** + * @hide + */ + public void setEnterSharedElementTransitionCallback(SharedElementCallback callback) { + setEnterSharedElementCallback(callback); + } + + /** * When custom transitions are used with Fragments, the exit transition callback * is called when this Fragment is attached or detached when popping the back stack. * * @param callback Used to manipulate the shared element transitions on this Fragment * when added as a pop from the back stack. */ - public void setExitSharedElementTransitionCallback(SharedElementCallback callback) { + public void setExitSharedElementCallback(SharedElementCallback callback) { if (callback == null) { callback = SharedElementCallback.NULL_CALLBACK; } @@ -1650,6 +1657,13 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene } /** + * @hide + */ + public void setExitSharedElementTransitionCallback(SharedElementCallback callback) { + setExitSharedElementCallback(callback); + } + + /** * Sets the Transition that will be used to move Views into the initial scene. The entering * Views will be those that are regular Views or ViewGroups that have * {@link ViewGroup#isTransitionGroup} return true. Typical Transitions will extend diff --git a/core/java/android/app/SharedElementCallback.java b/core/java/android/app/SharedElementCallback.java index 82d8e5b..d772743 100644 --- a/core/java/android/app/SharedElementCallback.java +++ b/core/java/android/app/SharedElementCallback.java @@ -32,8 +32,8 @@ import java.util.Map; * Listener provided in * {@link Activity#setEnterSharedElementCallback(SharedElementCallback)} and * {@link Activity#setExitSharedElementCallback(SharedElementCallback)} as well as - * {@link Fragment#setEnterSharedElementTransitionCallback(SharedElementCallback)} and - * {@link Fragment#setExitSharedElementTransitionCallback(SharedElementCallback)} + * {@link Fragment#setEnterSharedElementCallback(SharedElementCallback)} and + * {@link Fragment#setExitSharedElementCallback(SharedElementCallback)} * to monitor the Shared element transitions. The events can be used to customize Activity * and Fragment Transition behavior. */ |
