am fd08694e: am 215add2e: Merge "Hide TransitionManager default transition methods" into klp-dev (098bc61f) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -25635,10 +25635,8 @@ 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 android.transition.Transition getDefaultTransition();
		method public static void go(android.transition.Scene);
		method public static void go(android.transition.Scene, android.transition.Transition);
		method public void setDefaultTransition(android.transition.Transition);
		method public void setTransition(android.transition.Scene, android.transition.Transition);
		method public void setTransition(android.transition.Scene, android.transition.Scene, android.transition.Transition);
		method public void transitionTo(android.transition.Scene);

core/java/android/transition/TransitionManager.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -82,6 +82,8 @@ public class TransitionManager {
		* an {@link AutoTransition} instance.
		*
		* @param transition The default transition to be used for scene changes.
		*
		* @hide pending later changes
		*/
		public void setDefaultTransition(Transition transition) {
		sDefaultTransition = transition;
		@@ -93,6 +95,8 @@ public class TransitionManager {
		*
		* @return The current default transition.
		* @see #setDefaultTransition(Transition)
		*
		* @hide pending later changes
		*/
		public static Transition getDefaultTransition() {
		return sDefaultTransition;
		@@ -105,7 +109,7 @@ public class TransitionManager {
		* transition to run.
		* @param transition The transition that will play when the given scene is
		* entered. A value of null will result in the default behavior of
		* using the {@link #getDefaultTransition() default transition} instead.
		* using the default transition instead.
		*/
		public void setTransition(Scene scene, Transition transition) {
		mSceneTransitions.put(scene, transition);
		@@ -121,7 +125,7 @@ public class TransitionManager {
		* be run
		* @param transition The transition that will play when the given scene is
		* entered. A value of null will result in the default behavior of
		* using the {@link #getDefaultTransition() default transition} instead.
		* using the default transition instead.
		*/
		public void setTransition(Scene fromScene, Scene toScene, Transition transition) {
		ArrayMap<Scene, Transition> sceneTransitionMap = mScenePairTransitions.get(toScene);
		@@ -139,8 +143,8 @@ public class TransitionManager {
		*
		* @param scene The scene being entered
		* @return The Transition to be used for the given scene change. If no
		* Transition was specified for this scene change, the {@link #getDefaultTransition()
		* default transition} will be used instead.
		* Transition was specified for this scene change, the default transition
		* will be used instead.
		*/
		private Transition getTransition(Scene scene) {
		Transition transition = null;