diff --git a/api/current.txt b/api/current.txt index a66204e11e70f..e9da3987f4f9c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4328,9 +4328,9 @@ package android.app { method public void setAllowEnterTransitionOverlap(boolean); method public void setAllowReturnTransitionOverlap(boolean); method public void setArguments(android.os.Bundle); - method public void setEnterSharedElementTransitionCallback(android.app.SharedElementCallback); + method public void setEnterSharedElementCallback(android.app.SharedElementCallback); method public void setEnterTransition(android.transition.Transition); - method public void setExitSharedElementTransitionCallback(android.app.SharedElementCallback); + method public void setExitSharedElementCallback(android.app.SharedElementCallback); method public void setExitTransition(android.transition.Transition); method public void setHasOptionsMenu(boolean); method public void setInitialSavedState(android.app.Fragment.SavedState); diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 4374622a9de74..a95abab94eb9b 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -1628,13 +1628,20 @@ 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; } mEnterTransitionCallback = callback; } + /** + * @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. @@ -1642,13 +1649,20 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene * @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; } mExitTransitionCallback = callback; } + /** + * @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 diff --git a/core/java/android/app/SharedElementCallback.java b/core/java/android/app/SharedElementCallback.java index 82d8e5b5393c3..d7727435fbd87 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. */