Fix smooth progress behavior on JellyBean

chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.widget;
 
 import android.animation.TimeAnimator;
 import android.animation.TimeAnimator.TimeListener;
 import android.content.Context;
 import android.graphics.Color;
@@ skipping 78 matching lines @@
     };
 
     private final TimeAnimator mProgressAnimator = new TimeAnimator();
     {
         mProgressAnimator.setTimeListener(new TimeListener() {
             @Override
             public void onTimeUpdate(TimeAnimator animation, long totalTimeMs, long deltaTimeMs) {
                 // Cap progress bar animation frame time so that it doesn't jump too much even when
                 // the animation is janky.
                 float progress = mAnimationLogic.updateProgress(mTargetProgress,
-                        Math.max(deltaTimeMs, PROGRESS_FRAME_TIME_CAP_MS) * 0.001f, getWidth());
+                        Math.min(deltaTimeMs, PROGRESS_FRAME_TIME_CAP_MS) * 0.001f, getWidth());
                 ToolbarProgressBar.super.setProgress(progress);
 
                 if (mAnimatingView != null) {
                     int width = getDrawable().getBounds().right - getDrawable().getBounds().left;
                     mAnimatingView.update(progress * width);
 
                     // If the progress bar was updated, reset the callback that triggers the
                     // indeterminate animation.
                     removeCallbacks(mStartIndeterminate);
                     if (progress == 1.0) {
@@ skipping 232 matching lines @@
 
     @Override
     public void setForegroundColor(int color) {
         super.setForegroundColor(color);
         if (mAnimatingView != null) {
             mAnimatingView.setColor(ColorUtils.getColorWithOverlay(color, Color.WHITE,
                     ANIMATION_WHITE_FRACTION));
         }
     }
 }