diff options
| author | George Mount <mount@google.com> | 2015-03-31 10:22:33 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2015-04-08 14:51:36 -0700 |
| commit | 478673ede2142d01e93865ed123b0d32373c4cd9 (patch) | |
| tree | c89a6ab8468f11b355542470743a3b43428a9bb9 | |
| parent | ec3c97d27f2a424fa847561a3932a40c093a91a1 (diff) | |
| download | frameworks_base-478673ede2142d01e93865ed123b0d32373c4cd9.zip frameworks_base-478673ede2142d01e93865ed123b0d32373c4cd9.tar.gz frameworks_base-478673ede2142d01e93865ed123b0d32373c4cd9.tar.bz2 | |
Make TransitionManager.endTransitions() public.
Bug 19231835
Change-Id: I151bae1d10aaab72f8fea73eaf0538f0aa5d810a
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/transition/TransitionManager.java | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 1e57d19..1d0ed3f 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 544cbb3..4ec4733 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 0b70fdb..5209f90 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); |