summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2013-10-24 18:54:33 -0700
committerThe Android Automerger <android-build@google.com>2013-10-28 16:38:01 -0700
commitd9a8dacca654791d94845405045aeb3b9a2695c6 (patch)
treea74be1b95919a19392959ba54abcf8dc9b7984c5
parentb140fcdd7acbd6791e6e53e9297c24a59b55af7e (diff)
downloadbase-d9a8dacca654791d94845405045aeb3b9a2695c6.tar.gz
Hide TransitionManager default transition methods
Pending future API consideration. Change-Id: Ia4b162392e1c96b485bc28781a199bc2979ec53f
-rw-r--r--api/current.txt2
-rw-r--r--core/java/android/transition/TransitionManager.java12
2 files changed, 8 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index 5fc4da3b3359..014e91deca84 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25634,10 +25634,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);
diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java
index 404709c6a112..82789b862137 100644
--- a/core/java/android/transition/TransitionManager.java
+++ b/core/java/android/transition/TransitionManager.java
@@ -81,6 +81,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;
@@ -92,6 +94,8 @@ public class TransitionManager {
*
* @return The current default transition.
* @see #setDefaultTransition(Transition)
+ *
+ * @hide pending later changes
*/
public static Transition getDefaultTransition() {
return sDefaultTransition;
@@ -104,7 +108,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);
@@ -120,7 +124,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);
@@ -138,8 +142,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;