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

Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0

Browse Source
This commit is contained in:
Adam Cohen
2011-10-21 13:34:46 -07:00
committed by Android (Google) Code Review
parent 2dd2e5b4eb c798b6688a
commit e3bb0ecb2b
1 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
core/java/android/widget/StackView.java
View File

@@ -55,7 +55,6 @@ public class StackView extends AdapterViewAnimator {
* Default animation parameters * Default animation parameters
*/ */
private static final int DEFAULT_ANIMATION_DURATION = 400; private static final int DEFAULT_ANIMATION_DURATION = 400;
private static final int FADE_IN_ANIMATION_DURATION = 800;
private static final int MINIMUM_ANIMATION_DURATION = 50; private static final int MINIMUM_ANIMATION_DURATION = 50;
private static final int STACK_RELAYOUT_DURATION = 100; private static final int STACK_RELAYOUT_DURATION = 100;
@@ -222,8 +221,6 @@ public class StackView extends AdapterViewAnimator {
* Animate the views between different relative indexes within the {@link AdapterViewAnimator} * Animate the views between different relative indexes within the {@link AdapterViewAnimator}
*/ */
void transformViewForTransition(int fromIndex, int toIndex, final View view, boolean animate) { void transformViewForTransition(int fromIndex, int toIndex, final View view, boolean animate) {
ObjectAnimator alphaOa;
if (!animate) { if (!animate) {
((StackFrame) view).cancelSliderAnimator(); ((StackFrame) view).cancelSliderAnimator();
view.setRotationX(0f); view.setRotationX(0f);
@@ -233,22 +230,9 @@ public class StackView extends AdapterViewAnimator {
} }
if (fromIndex == -1 && toIndex == getNumActiveViews() -1) { if (fromIndex == -1 && toIndex == getNumActiveViews() -1) {
// Fade item in
if (view.getAlpha() == 1) {
view.setAlpha(0);
}
transformViewAtIndex(toIndex, view, false); transformViewAtIndex(toIndex, view, false);
view.setVisibility(VISIBLE); view.setVisibility(VISIBLE);
((StackFrame) view).cancelAlphaAnimator();
if (animate) {
alphaOa = ObjectAnimator.ofFloat(view, "alpha", view.getAlpha(), 1.0f);
alphaOa.setDuration(FADE_IN_ANIMATION_DURATION);
((StackFrame) view).setAlphaAnimator(alphaOa);
alphaOa.start();
} else {
view.setAlpha(1.0f); view.setAlpha(1.0f);
}
} else if (fromIndex == 0 && toIndex == 1) { } else if (fromIndex == 0 && toIndex == 1) {
// Slide item in // Slide item in
((StackFrame) view).cancelSliderAnimator(); ((StackFrame) view).cancelSliderAnimator();
@@ -306,13 +290,12 @@ public class StackView extends AdapterViewAnimator {
view.setAlpha(1.0f); view.setAlpha(1.0f);
view.setVisibility(VISIBLE); view.setVisibility(VISIBLE);
} else if (toIndex == -1) { } else if (toIndex == -1) {
// Fade item out
((StackFrame) view).cancelAlphaAnimator();
if (animate) { if (animate) {
alphaOa = ObjectAnimator.ofFloat(view, "alpha", view.getAlpha(), 0.0f); postDelayed(new Runnable() {
alphaOa.setDuration(STACK_RELAYOUT_DURATION); public void run() {
((StackFrame) view).setAlphaAnimator(alphaOa); view.setAlpha(0);
alphaOa.start(); }
}, STACK_RELAYOUT_DURATION);
} else { } else {
view.setAlpha(0f); view.setAlpha(0f);
} }
@@ -485,7 +468,6 @@ public class StackView extends AdapterViewAnimator {
} }
private static class StackFrame extends FrameLayout { private static class StackFrame extends FrameLayout {
WeakReference<ObjectAnimator> alphaAnimator;
WeakReference<ObjectAnimator> transformAnimator; WeakReference<ObjectAnimator> transformAnimator;
WeakReference<ObjectAnimator> sliderAnimator; WeakReference<ObjectAnimator> sliderAnimator;
@@ -493,10 +475,6 @@ public class StackView extends AdapterViewAnimator {
super(context); super(context);
} }
void setAlphaAnimator(ObjectAnimator oa) {
alphaAnimator = new WeakReference<ObjectAnimator>(oa);
}
void setTransformAnimator(ObjectAnimator oa) { void setTransformAnimator(ObjectAnimator oa) {
transformAnimator = new WeakReference<ObjectAnimator>(oa); transformAnimator = new WeakReference<ObjectAnimator>(oa);
} }
@@ -505,17 +483,6 @@ public class StackView extends AdapterViewAnimator {
sliderAnimator = new WeakReference<ObjectAnimator>(oa); sliderAnimator = new WeakReference<ObjectAnimator>(oa);
} }
boolean cancelAlphaAnimator() {
if (alphaAnimator != null) {
ObjectAnimator oa = alphaAnimator.get();
if (oa != null) {
oa.cancel();
return true;
}
}
return false;
}
boolean cancelTransformAnimator() { boolean cancelTransformAnimator() {
if (transformAnimator != null) { if (transformAnimator != null) {
ObjectAnimator oa = transformAnimator.get(); ObjectAnimator oa = transformAnimator.get();