From ad88e1b1b2c57fa56bde68764b22240d145fa0ef Mon Sep 17 00:00:00 2001 From: George Mount Date: Fri, 18 Jul 2014 15:41:13 -0700 Subject: [PATCH] API Council: Change docs and constant names. Bug 16401545 Changed doc for ChangeImageTransform. Changed IN/OUT to MODE_IN/MODE_OUT. Changed mode to flag attribute. Change-Id: Ia2ae9930f9725871c9b1d80b758a3a0808a8f0c6 --- api/current.txt | 4 +-- .../android/transition/ChangeImageTransform.java | 34 +++++----------------- core/java/android/transition/Fade.java | 8 ++--- core/java/android/transition/Visibility.java | 22 +++++++------- core/res/res/values/attrs.xml | 6 ++-- 5 files changed, 26 insertions(+), 48 deletions(-) diff --git a/api/current.txt b/api/current.txt index 863a88b8a6ec..168be11d95e4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31975,8 +31975,8 @@ package android.transition { method public android.animation.Animator onDisappear(android.view.ViewGroup, android.transition.TransitionValues, int, android.transition.TransitionValues, int); method public android.animation.Animator onDisappear(android.view.ViewGroup, android.view.View, android.transition.TransitionValues, android.transition.TransitionValues); method public void setMode(int); - field public static final int IN = 1; // 0x1 - field public static final int OUT = 2; // 0x2 + field public static final int MODE_IN = 1; // 0x1 + field public static final int MODE_OUT = 2; // 0x2 } public abstract class VisibilityPropagation extends android.transition.TransitionPropagation { diff --git a/core/java/android/transition/ChangeImageTransform.java b/core/java/android/transition/ChangeImageTransform.java index 12437d781ec8..2b267565ce09 100644 --- a/core/java/android/transition/ChangeImageTransform.java +++ b/core/java/android/transition/ChangeImageTransform.java @@ -32,10 +32,12 @@ import android.widget.ImageView; import java.util.Map; /** - * Transitions changes in ImageView {@link ImageView#setScaleType(ImageView.ScaleType)} as - * well as image scaling due to ImageView size changes. When combined with - * {@link android.transition.ChangeBounds}, an ImageView that changes size will - * scale smoothly. + * This Transition captures an ImageView's matrix before and after the + * scene change and animates it during the transition. + * + *

In combination with ChangeBounds, ChangeImageTransform allows ImageViews + * that change size, shape, or {@link android.widget.ImageView.ScaleType} to animate contents + * smoothly.

*/ public class ChangeImageTransform extends Transition { @@ -192,30 +194,8 @@ public class ChangeImageTransform extends Transition { private ObjectAnimator createMatrixAnimator(final ImageView imageView, Matrix startMatrix, final Matrix endMatrix) { - ObjectAnimator animator = ObjectAnimator.ofObject(imageView, ANIMATED_TRANSFORM_PROPERTY, + return ObjectAnimator.ofObject(imageView, ANIMATED_TRANSFORM_PROPERTY, new MatrixEvaluator(), startMatrix, endMatrix); - /* - AnimatorListenerAdapter listener = new AnimatorListenerAdapter() { - private Matrix mPausedMatrix; - - @Override - public void onAnimationPause(Animator animation) { - if (mPausedMatrix == null) { - mPausedMatrix = new Matrix(); - } - Matrix imageMatrix = imageView.getImageMatrix(); - mPausedMatrix.set(imageMatrix); - imageView.animateTransform(endMatrix); - } - - @Override - public void onAnimationResume(Animator animation) { - imageView.animateTransform(mPausedMatrix); - } - }; - animator.addPauseListener(listener); - */ - return animator; } private static class MatrixEvaluator implements TypeEvaluator { diff --git a/core/java/android/transition/Fade.java b/core/java/android/transition/Fade.java index 420c2488d069..1f9d0932476f 100644 --- a/core/java/android/transition/Fade.java +++ b/core/java/android/transition/Fade.java @@ -69,17 +69,17 @@ public class Fade extends Visibility { * Fading mode used in {@link #Fade(int)} to make the transition * operate on targets that are appearing. Maybe be combined with * {@link #OUT} to fade both in and out. Equivalent to - * {@link Visibility#IN}. + * {@link Visibility#MODE_IN}. */ - public static final int IN = Visibility.IN; + public static final int IN = Visibility.MODE_IN; /** * Fading mode used in {@link #Fade(int)} to make the transition * operate on targets that are disappearing. Maybe be combined with * {@link #IN} to fade both in and out. Equivalent to - * {@link Visibility#OUT}. + * {@link Visibility#MODE_OUT}. */ - public static final int OUT = Visibility.OUT; + public static final int OUT = Visibility.MODE_OUT; /** * Constructs a Fade transition that will fade targets in and out. diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java index cf5ea4c6dfb5..af2016ccf2a4 100644 --- a/core/java/android/transition/Visibility.java +++ b/core/java/android/transition/Visibility.java @@ -50,16 +50,16 @@ public abstract class Visibility extends Transition { /** * Mode used in {@link #setMode(int)} to make the transition * operate on targets that are appearing. Maybe be combined with - * {@link #OUT} to target Visibility changes both in and out. + * {@link #MODE_OUT} to target Visibility changes both in and out. */ - public static final int IN = 0x1; + public static final int MODE_IN = 0x1; /** * Mode used in {@link #setMode(int)} to make the transition * operate on targets that are disappearing. Maybe be combined with - * {@link #IN} to target Visibility changes both in and out. + * {@link #MODE_IN} to target Visibility changes both in and out. */ - public static final int OUT = 0x2; + public static final int MODE_OUT = 0x2; private static final String[] sTransitionProperties = { PROPNAME_VISIBILITY, @@ -76,7 +76,7 @@ public abstract class Visibility extends Transition { ViewGroup endParent; } - private int mMode = IN | OUT; + private int mMode = MODE_IN | MODE_OUT; private int mForcedStartVisibility = -1; private int mForcedEndVisibility = -1; @@ -98,12 +98,12 @@ public abstract class Visibility extends Transition { * on mode. * * @param mode The behavior supported by this transition, a combination of - * {@link #IN} and {@link #OUT}. + * {@link #MODE_IN} and {@link #MODE_OUT}. * @attr ref android.R.styleable#VisibilityTransition_visibilityMode */ public void setMode(int mode) { - if ((mode & ~(IN | OUT)) != 0) { - throw new IllegalArgumentException("Only IN and OUT flags are allowed"); + if ((mode & ~(MODE_IN | MODE_OUT)) != 0) { + throw new IllegalArgumentException("Only MODE_IN and MODE_OUT flags are allowed"); } mMode = mode; } @@ -112,7 +112,7 @@ public abstract class Visibility extends Transition { * Returns whether appearing and/or disappearing Views are supported. * * Returns whether appearing and/or disappearing Views are supported. A combination of - * {@link #IN} and {@link #OUT}. + * {@link #MODE_IN} and {@link #MODE_OUT}. * @attr ref android.R.styleable#VisibilityTransition_visibilityMode */ public int getMode() { @@ -276,7 +276,7 @@ public abstract class Visibility extends Transition { public Animator onAppear(ViewGroup sceneRoot, TransitionValues startValues, int startVisibility, TransitionValues endValues, int endVisibility) { - if ((mMode & IN) != IN || endValues == null) { + if ((mMode & MODE_IN) != MODE_IN || endValues == null) { return null; } return onAppear(sceneRoot, endValues.view, startValues, endValues); @@ -339,7 +339,7 @@ public abstract class Visibility extends Transition { public Animator onDisappear(ViewGroup sceneRoot, TransitionValues startValues, int startVisibility, TransitionValues endValues, int endVisibility) { - if ((mMode & OUT) != OUT) { + if ((mMode & MODE_OUT) != MODE_OUT) { return null; } diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 8d1b397b67d6..d7525d594bc2 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -5468,11 +5468,9 @@ Corresponds to {@link android.transition.Visibility#setMode(int)}. --> - + - - - +