Index: chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java |
index 3a0c9423e5bcdc02c08ad8b5befd81466c657c59..2451d706edcd4ec2a3e0799df301fc98e146c443 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java |
@@ -8,6 +8,7 @@ import android.animation.TimeAnimator; |
import android.animation.TimeAnimator.TimeListener; |
import android.content.Context; |
import android.graphics.Color; |
+import android.os.Build; |
import android.support.v4.view.ViewCompat; |
import android.text.TextUtils; |
import android.util.AttributeSet; |
@@ -57,7 +58,7 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar { |
// The amount of time in ms that the progress bar has to be stopped before the indeterminate |
// animation starts. |
- private static final long ANIMATION_START_THRESHOLD = 3000; |
+ private static final long ANIMATION_START_THRESHOLD = 5000; |
private static final float THEMED_BACKGROUND_WHITE_FRACTION = 0.2f; |
private static final float THEMED_FOREGROUND_BLACK_FRACTION = 0.64f; |
@@ -191,7 +192,8 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar { |
if (TextUtils.equals(animation, "smooth")) { |
mAnimationLogic = new ProgressAnimationSmooth(); |
- } else if (TextUtils.equals(animation, "smooth-indeterminate")) { |
+ } else if (TextUtils.equals(animation, "smooth-indeterminate") |
+ && Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) { |
mAnimationLogic = new ProgressAnimationSmooth(); |
LayoutParams animationParams = new LayoutParams(getLayoutParams()); |