Merge "Reduce unnecessary layout passes" into ics-mr1

This commit is contained in:
Michael Jurka
2011-11-10 15:02:00 -08:00
committed by Android (Google) Code Review
9 changed files with 47 additions and 80 deletions
+2 -2
View File
@@ -1790,7 +1790,7 @@ public abstract class PagedView extends ViewGroup {
updateScrollingIndicatorPosition();
cancelScrollingIndicatorAnimations();
if (immediately) {
mScrollIndicator.setVisibility(View.GONE);
mScrollIndicator.setVisibility(View.INVISIBLE);
mScrollIndicator.setAlpha(0f);
} else {
mScrollIndicatorAnimator = ObjectAnimator.ofFloat(mScrollIndicator, "alpha", 0f);
@@ -1804,7 +1804,7 @@ public abstract class PagedView extends ViewGroup {
@Override
public void onAnimationEnd(Animator animation) {
if (!cancelled) {
mScrollIndicator.setVisibility(View.GONE);
mScrollIndicator.setVisibility(View.INVISIBLE);
}
}
});