Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef8bed5 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Make TransitionManager.endTransitions() public."

parents 22e67b55 478673ed

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32506,6 +32506,7 @@ package android.transition { 
    ctor public TransitionManager();

    method public static void beginDelayedTransition(android.view.ViewGroup);

    method public static void beginDelayedTransition(android.view.ViewGroup, android.transition.Transition);

    method public static void endTransitions(android.view.ViewGroup);

    method public static void go(android.transition.Scene);

    method public static void go(android.transition.Scene, android.transition.Transition);

    method public void setTransition(android.transition.Scene, android.transition.Transition);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35110,6 +35110,7 @@ package android.transition { 
    ctor public TransitionManager();

    method public static void beginDelayedTransition(android.view.ViewGroup);

    method public static void beginDelayedTransition(android.view.ViewGroup, android.transition.Transition);

    method public static void endTransitions(android.view.ViewGroup);

    method public static void go(android.transition.Scene);

    method public static void go(android.transition.Scene, android.transition.Transition);

    method public void setTransition(android.transition.Scene, android.transition.Transition);

core/java/android/transition/TransitionManager.java

+0 −1
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ public class TransitionManager { 
     * Ends all pending and ongoing transitions on the specified scene root.

     *

     * @param sceneRoot The root of the View hierarchy to end transitions on.

     * @hide

     */

    public static void endTransitions(final ViewGroup sceneRoot) {

        sPendingTransitions.remove(sceneRoot);