| Index: chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java
|
| index 7b26b7f9af3dcd3168686fb7bc60394801d3eb1f..9c4c0418a3b15d89002ad8f48165beca1feed45c 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java
|
| @@ -99,13 +99,14 @@ public class ToolbarProgressBarAnimatingView extends ImageView {
|
| slowAnimation.addUpdateListener(mListener);
|
|
|
| mAnimatorSet.playSequentially(fastAnimation, slowAnimation);
|
| - mAnimatorSet.setStartDelay(ANIMATION_DELAY_MS);
|
|
|
| slowAnimation.addListener(new AnimatorListenerAdapter() {
|
| @Override
|
| public void onAnimationEnd(Animator a) {
|
| // Replay the animation if it has not been canceled.
|
| if (mIsCanceled) return;
|
| + // Repeats of the animation should have a start delay.
|
| + mAnimatorSet.setStartDelay(ANIMATION_DELAY_MS);
|
| mAnimatorSet.start();
|
| }
|
| });
|
| @@ -117,10 +118,14 @@ public class ToolbarProgressBarAnimatingView extends ImageView {
|
| public void startAnimation() {
|
| mIsCanceled = false;
|
| if (!mAnimatorSet.isStarted()) {
|
| + // Set the initial start delay to 0ms so it starts immediately.
|
| + mAnimatorSet.setStartDelay(0);
|
| +
|
| // Reset position.
|
| setScaleX(0.0f);
|
| setTranslationX(0.0f);
|
| mAnimatorSet.start();
|
| +
|
| // Fade in to look nice on sites that trigger many loads that end quickly.
|
| animate().alpha(1.0f)
|
| .setDuration(500)
|
|
|