Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do animations correctly in systemUI" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-21 22:20:43 +00:00
committed by Android (Google) Code Review
parent 97fb7a734f 843f541737
commit afa0f25379
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
View File

@@ -225,16 +225,22 @@ public class StackStateAnimator {
// start height animation // start height animation
if (heightChanging) { if (heightChanging) {
startHeightAnimation(child, viewState, duration, delay); startHeightAnimation(child, viewState, duration, delay);
} else {
abortAnimation(child, TAG_ANIMATOR_HEIGHT);
} }
// start shadow alpha animation // start shadow alpha animation
if (shadowAlphaChanging) { if (shadowAlphaChanging) {
startShadowAlphaAnimation(child, viewState, duration, delay); startShadowAlphaAnimation(child, viewState, duration, delay);
} else {
abortAnimation(child, TAG_ANIMATOR_SHADOW_ALPHA);
} }
// start top inset animation // start top inset animation
if (topInsetChanging) { if (topInsetChanging) {
startInsetAnimation(child, viewState, duration, delay); startInsetAnimation(child, viewState, duration, delay);
} else {
abortAnimation(child, TAG_ANIMATOR_TOP_INSET);
} }
// start dimmed animation // start dimmed animation
@@ -286,16 +292,29 @@ public class StackStateAnimator {
// start translationY animation // start translationY animation
if (yTranslationChanging) { if (yTranslationChanging) {
startYTranslationAnimation(child, viewState, duration, delay); startYTranslationAnimation(child, viewState, duration, delay);
} else {
abortAnimation(child, TAG_ANIMATOR_TRANSLATION_Y);
} }
// start translationZ animation // start translationZ animation
if (zTranslationChanging) { if (zTranslationChanging) {
startZTranslationAnimation(child, viewState, duration, delay); startZTranslationAnimation(child, viewState, duration, delay);
} else {
abortAnimation(child, TAG_ANIMATOR_TRANSLATION_Z);
} }
// start alpha animation // start alpha animation
if (alphaChanging && child.getTranslationX() == 0) { if (alphaChanging && child.getTranslationX() == 0) {
startAlphaAnimation(child, viewState, duration, delay); startAlphaAnimation(child, viewState, duration, delay);
} else {
abortAnimation(child, TAG_ANIMATOR_ALPHA);
}
}
private void abortAnimation(View child, int animatorTag) {
Animator previousAnimator = getChildTag(child, animatorTag);
if (previousAnimator != null) {
previousAnimator.cancel();
} }
} }
@@ -413,7 +432,8 @@ public class StackStateAnimator {
animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator); long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);
animator.setDuration(newDuration); animator.setDuration(newDuration);
if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) { if (delay > 0 && (previousAnimator == null
|| previousAnimator.getAnimatedFraction() == 0)) {
animator.setStartDelay(delay); animator.setStartDelay(delay);
} }
animator.addListener(getGlobalAnimationFinishedListener()); animator.addListener(getGlobalAnimationFinishedListener());
@@ -472,7 +492,8 @@ public class StackStateAnimator {
animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator); long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);
animator.setDuration(newDuration); animator.setDuration(newDuration);
if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) { if (delay > 0 && (previousAnimator == null
|| previousAnimator.getAnimatedFraction() == 0)) {
animator.setStartDelay(delay); animator.setStartDelay(delay);
} }
animator.addListener(getGlobalAnimationFinishedListener()); animator.addListener(getGlobalAnimationFinishedListener());
@@ -548,7 +569,8 @@ public class StackStateAnimator {
animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator); long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);
animator.setDuration(newDuration); animator.setDuration(newDuration);
if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) { if (delay > 0 && (previousAnimator == null
|| previousAnimator.getAnimatedFraction() == 0)) {
animator.setStartDelay(delay); animator.setStartDelay(delay);
} }
animator.addListener(getGlobalAnimationFinishedListener()); animator.addListener(getGlobalAnimationFinishedListener());
@@ -630,7 +652,8 @@ public class StackStateAnimator {
}); });
long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator); long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);
animator.setDuration(newDuration); animator.setDuration(newDuration);
if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) { if (delay > 0 && (previousAnimator == null
|| previousAnimator.getAnimatedFraction() == 0)) {
animator.setStartDelay(delay); animator.setStartDelay(delay);
} }
animator.addListener(getGlobalAnimationFinishedListener()); animator.addListener(getGlobalAnimationFinishedListener());
@@ -674,7 +697,8 @@ public class StackStateAnimator {
animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator); long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);
animator.setDuration(newDuration); animator.setDuration(newDuration);
if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) { if (delay > 0 && (previousAnimator == null
|| previousAnimator.getAnimatedFraction() == 0)) {
animator.setStartDelay(delay); animator.setStartDelay(delay);
} }
animator.addListener(getGlobalAnimationFinishedListener()); animator.addListener(getGlobalAnimationFinishedListener());
@@ -729,7 +753,8 @@ public class StackStateAnimator {
animator.setInterpolator(interpolator); animator.setInterpolator(interpolator);
long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator); long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);
animator.setDuration(newDuration); animator.setDuration(newDuration);
if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) { if (delay > 0 && (previousAnimator == null
|| previousAnimator.getAnimatedFraction() == 0)) {
animator.setStartDelay(delay); animator.setStartDelay(delay);
} }
animator.addListener(getGlobalAnimationFinishedListener()); animator.addListener(getGlobalAnimationFinishedListener());