From 478673ede2142d01e93865ed123b0d32373c4cd9 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Tue, 31 Mar 2015 10:22:33 -0700
Subject: [PATCH] Make TransitionManager.endTransitions() public.

Bug 19231835

Change-Id: I151bae1d10aaab72f8fea73eaf0538f0aa5d810a
---
 api/current.txt                                     | 1 +
 api/system-current.txt                              | 1 +
 core/java/android/transition/TransitionManager.java | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 1e57d19edc557..1d0ed3fcb77c1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -32456,6 +32456,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);
diff --git a/api/system-current.txt b/api/system-current.txt
index 544cbb3069bb8..4ec47330d533e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -35001,6 +35001,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);
diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java
index 0b70fdbe5a4f5..5209f90cab68f 100644
--- a/core/java/android/transition/TransitionManager.java
+++ b/core/java/android/transition/TransitionManager.java
@@ -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);