LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues in LayoutAnimationsHideShow demo.

Browse Source 
There were various minor issues with this app that made it not work
correctly in some situations (the APPEARING animation was basically a no-op,
and disabling the custom animations disabled animations altogether).

Change-Id: I20aba9551043a63c21d26208ae7cd0395cde01cb
This commit is contained in:
Chet Haase
2011-08-11 11:36:33 -07:00
parent f9e27297b0
commit dd722e4680
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
samples/ApiDemos/src/com/example/android/apis/animation/LayoutAnimationsHideShow.java
View File

@@ -44,6 +44,7 @@ public class LayoutAnimationsHideShow extends Activity {
private int numButtons = 1; private int numButtons = 1;
ViewGroup container = null; ViewGroup container = null;
private LayoutTransition mTransitioner;
/** Called when the activity is first created. */ /** Called when the activity is first created. */
@Override @Override
@@ -69,8 +70,8 @@ public class LayoutAnimationsHideShow extends Activity {
} }
}); });
} }
final LayoutTransition transitioner = new LayoutTransition();
container.setLayoutTransition(transitioner); resetTransition();
ViewGroup parent = (ViewGroup) findViewById(R.id.parent); ViewGroup parent = (ViewGroup) findViewById(R.id.parent);
parent.addView(container); parent.addView(container);
@@ -90,25 +91,25 @@ public class LayoutAnimationsHideShow extends Activity {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
long duration; long duration;
if (isChecked) { if (isChecked) {
transitioner.setStagger(LayoutTransition.CHANGE_APPEARING, 30); mTransitioner.setStagger(LayoutTransition.CHANGE_APPEARING, 30);
transitioner.setStagger(LayoutTransition.CHANGE_DISAPPEARING, 30); mTransitioner.setStagger(LayoutTransition.CHANGE_DISAPPEARING, 30);
setupAnimations(transitioner); setupCustomAnimations();
duration = 500; duration = 500;
} else { } else {
transitioner.setStagger(LayoutTransition.CHANGE_APPEARING, 0); resetTransition();
transitioner.setStagger(LayoutTransition.CHANGE_DISAPPEARING, 0);
transitioner.setAnimator(LayoutTransition.APPEARING, null);
transitioner.setAnimator(LayoutTransition.DISAPPEARING, null);
transitioner.setAnimator(LayoutTransition.CHANGE_APPEARING, null);
transitioner.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, null);
duration = 300; duration = 300;
} }
transitioner.setDuration(duration); mTransitioner.setDuration(duration);
} }
}); });
} }
private void setupAnimations(LayoutTransition transition) { private void resetTransition() {
mTransitioner = new LayoutTransition();
container.setLayoutTransition(mTransitioner);
}
private void setupCustomAnimations() {
// Changing while Adding // Changing while Adding
PropertyValuesHolder pvhLeft = PropertyValuesHolder pvhLeft =
PropertyValuesHolder.ofInt("left", 0, 1); PropertyValuesHolder.ofInt("left", 0, 1);
@@ -124,8 +125,8 @@ public class LayoutAnimationsHideShow extends Activity {
PropertyValuesHolder.ofFloat("scaleY", 1f, 0f, 1f); PropertyValuesHolder.ofFloat("scaleY", 1f, 0f, 1f);
final ObjectAnimator changeIn = ObjectAnimator.ofPropertyValuesHolder( final ObjectAnimator changeIn = ObjectAnimator.ofPropertyValuesHolder(
this, pvhLeft, pvhTop, pvhRight, pvhBottom, pvhScaleX, pvhScaleY). this, pvhLeft, pvhTop, pvhRight, pvhBottom, pvhScaleX, pvhScaleY).
setDuration(transition.getDuration(LayoutTransition.CHANGE_APPEARING)); setDuration(mTransitioner.getDuration(LayoutTransition.CHANGE_APPEARING));
transition.setAnimator(LayoutTransition.CHANGE_APPEARING, changeIn); mTransitioner.setAnimator(LayoutTransition.CHANGE_APPEARING, changeIn);
changeIn.addListener(new AnimatorListenerAdapter() { changeIn.addListener(new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator anim) { public void onAnimationEnd(Animator anim) {
View view = (View) ((ObjectAnimator) anim).getTarget(); View view = (View) ((ObjectAnimator) anim).getTarget();
@@ -142,8 +143,8 @@ public class LayoutAnimationsHideShow extends Activity {
PropertyValuesHolder.ofKeyframe("rotation", kf0, kf1, kf2); PropertyValuesHolder.ofKeyframe("rotation", kf0, kf1, kf2);
final ObjectAnimator changeOut = ObjectAnimator.ofPropertyValuesHolder( final ObjectAnimator changeOut = ObjectAnimator.ofPropertyValuesHolder(
this, pvhLeft, pvhTop, pvhRight, pvhBottom, pvhRotation). this, pvhLeft, pvhTop, pvhRight, pvhBottom, pvhRotation).
setDuration(transition.getDuration(LayoutTransition.CHANGE_DISAPPEARING)); setDuration(mTransitioner.getDuration(LayoutTransition.CHANGE_DISAPPEARING));
transition.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, changeOut); mTransitioner.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, changeOut);
changeOut.addListener(new AnimatorListenerAdapter() { changeOut.addListener(new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator anim) { public void onAnimationEnd(Animator anim) {
View view = (View) ((ObjectAnimator) anim).getTarget(); View view = (View) ((ObjectAnimator) anim).getTarget();
@@ -153,8 +154,8 @@ public class LayoutAnimationsHideShow extends Activity {
// Adding // Adding
ObjectAnimator animIn = ObjectAnimator.ofFloat(null, "rotationY", 90f, 0f). ObjectAnimator animIn = ObjectAnimator.ofFloat(null, "rotationY", 90f, 0f).
setDuration(transition.getDuration(LayoutTransition.APPEARING)); setDuration(mTransitioner.getDuration(LayoutTransition.APPEARING));
transition.setAnimator(LayoutTransition.APPEARING, animIn); mTransitioner.setAnimator(LayoutTransition.APPEARING, animIn);
animIn.addListener(new AnimatorListenerAdapter() { animIn.addListener(new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator anim) { public void onAnimationEnd(Animator anim) {
View view = (View) ((ObjectAnimator) anim).getTarget(); View view = (View) ((ObjectAnimator) anim).getTarget();
@@ -164,9 +165,9 @@ public class LayoutAnimationsHideShow extends Activity {
// Removing // Removing
ObjectAnimator animOut = ObjectAnimator.ofFloat(null, "rotationX", 0f, 90f). ObjectAnimator animOut = ObjectAnimator.ofFloat(null, "rotationX", 0f, 90f).
setDuration(transition.getDuration(LayoutTransition.DISAPPEARING)); setDuration(mTransitioner.getDuration(LayoutTransition.DISAPPEARING));
transition.setAnimator(LayoutTransition.DISAPPEARING, animOut); mTransitioner.setAnimator(LayoutTransition.DISAPPEARING, animOut);
animIn.addListener(new AnimatorListenerAdapter() { animOut.addListener(new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator anim) { public void onAnimationEnd(Animator anim) {
View view = (View) ((ObjectAnimator) anim).getTarget(); View view = (View) ((ObjectAnimator) anim).getTarget();
view.setRotationX(0f); view.setRotationX(0f);