diff options
| -rwxr-xr-x | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/transition/Scene.java | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index ae7270dc7e01..92c1a782d43c 100755 --- a/api/current.txt +++ b/api/current.txt @@ -45841,6 +45841,7 @@ package android.transition { ctor public deprecated Scene(android.view.ViewGroup, android.view.ViewGroup); method public void enter(); method public void exit(); + method public static android.transition.Scene getCurrentScene(android.view.View); method public static android.transition.Scene getSceneForLayout(android.view.ViewGroup, int, android.content.Context); method public android.view.ViewGroup getSceneRoot(); method public void setEnterAction(java.lang.Runnable); diff --git a/core/java/android/transition/Scene.java b/core/java/android/transition/Scene.java index 1bdcff98ff17..7e499f29122a 100644 --- a/core/java/android/transition/Scene.java +++ b/core/java/android/transition/Scene.java @@ -16,6 +16,8 @@ package android.transition; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.util.SparseArray; @@ -196,22 +198,24 @@ public final class Scene { * information is used by Scene to determine whether there is a previous * scene which should be exited before the new scene is entered. * - * @param view The view on which the current scene is being set + * @param sceneRoot The view on which the current scene is being set */ @UnsupportedAppUsage - static void setCurrentScene(View view, Scene scene) { - view.setTagInternal(com.android.internal.R.id.current_scene, scene); + static void setCurrentScene(@NonNull View sceneRoot, @Nullable Scene scene) { + sceneRoot.setTagInternal(com.android.internal.R.id.current_scene, scene); } /** * Gets the current {@link Scene} set on the given view. A scene is set on a view * only if that view is the scene root. * + * @param sceneRoot The view on which the current scene will be returned * @return The current Scene set on this view. A value of null indicates that * no Scene is currently set. */ - static Scene getCurrentScene(View view) { - return (Scene) view.getTag(com.android.internal.R.id.current_scene); + @Nullable + public static Scene getCurrentScene(@NonNull View sceneRoot) { + return (Scene) sceneRoot.getTag(com.android.internal.R.id.current_scene); } /** |