diff options
| author | George Mount <mount@google.com> | 2014-03-10 16:51:16 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-04-07 09:14:09 -0700 |
| commit | d6107a3170df61d9e776fcd5666acfc9135c6f16 (patch) | |
| tree | 8eebc42794fe87d3974a3e9bd21ab47b0244ae23 /core/java/android/transition/TransitionSet.java | |
| parent | cb4b7d999e7bcba608726188421772e313e67163 (diff) | |
Add Transitions useful for Activity transitions.
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders
Moved capability from Fade to Visibility.
Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
Diffstat (limited to 'core/java/android/transition/TransitionSet.java')
| -rw-r--r-- | core/java/android/transition/TransitionSet.java | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java index 19d6b3d3c393..966b24dc033a 100644 --- a/core/java/android/transition/TransitionSet.java +++ b/core/java/android/transition/TransitionSet.java @@ -17,6 +17,7 @@ package android.transition; import android.animation.TimeInterpolator; +import android.graphics.Rect; import android.util.AndroidRuntimeException; import android.view.View; import android.view.ViewGroup; @@ -315,6 +316,15 @@ public class TransitionSet extends Transition { } } + @Override + void capturePropagationValues(TransitionValues transitionValues) { + super.capturePropagationValues(transitionValues); + int numTransitions = mTransitions.size(); + for (int i = 0; i < numTransitions; ++i) { + mTransitions.get(i).capturePropagationValues(transitionValues); + } + } + /** @hide */ @Override public void pause(View sceneRoot) { @@ -365,6 +375,24 @@ public class TransitionSet extends Transition { } @Override + public void setPropagation(TransitionPropagation propagation) { + super.setPropagation(propagation); + int numTransitions = mTransitions.size(); + for (int i = 0; i < numTransitions; ++i) { + mTransitions.get(i).setPropagation(propagation); + } + } + + @Override + public void setEpicenterCallback(EpicenterCallback epicenterCallback) { + super.setEpicenterCallback(epicenterCallback); + int numTransitions = mTransitions.size(); + for (int i = 0; i < numTransitions; ++i) { + mTransitions.get(i).setEpicenterCallback(epicenterCallback); + } + } + + @Override String toString(String indent) { String result = super.toString(indent); for (int i = 0; i < mTransitions.size(); ++i) { @@ -383,5 +411,4 @@ public class TransitionSet extends Transition { } return clone; } - } |
