| Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| index 003b5cc31fdc17f9cbaf41749d806692612fb625..c02cc408a9b7b1e72ed668492c1014587a87350b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| @@ -76,6 +76,9 @@ public class ToolbarPhone extends ToolbarLayout
|
| implements Invalidator.Client, OnClickListener, OnLongClickListener,
|
| NewTabPage.OnSearchBoxScrollListener {
|
|
|
| + /** The amount of time transitioning from one theme color to another should take in ms. */
|
| + public static final long THEME_COLOR_TRANSITION_DURATION = 250;
|
| +
|
| public static final int URL_FOCUS_CHANGE_ANIMATION_DURATION_MS = 250;
|
| private static final int URL_FOCUS_TOOLBAR_BUTTONS_TRANSLATION_X_DP = 10;
|
| private static final int URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS = 100;
|
| @@ -89,8 +92,6 @@ public class ToolbarPhone extends ToolbarLayout
|
|
|
| private static final float UNINITIALIZED_PERCENT = -1f;
|
|
|
| - private static final int BRAND_COLOR_TRANSITION_DURATION_MS = 250;
|
| -
|
| private static final String TAG = "ToolbarPhone";
|
|
|
| static final int LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA = 51;
|
| @@ -1859,7 +1860,7 @@ public class ToolbarPhone extends ToolbarLayout
|
| shouldUseOpaque ? 255 : LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA;
|
| final boolean shouldAnimateAlpha = initialAlpha != finalAlpha;
|
| mBrandColorTransitionAnimation = ValueAnimator.ofFloat(0, 1)
|
| - .setDuration(BRAND_COLOR_TRANSITION_DURATION_MS);
|
| + .setDuration(THEME_COLOR_TRANSITION_DURATION);
|
| mBrandColorTransitionAnimation.setInterpolator(BakedBezierInterpolator.TRANSFORM_CURVE);
|
| mBrandColorTransitionAnimation.addUpdateListener(new AnimatorUpdateListener() {
|
| @Override
|
|
|