| 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 c10141438b561cc3b62993b3efdf2474e297e589..2bf12e2490f27b7629e6b6083746263e132dcbc8 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
|
| @@ -1910,13 +1910,18 @@ public class ToolbarPhone extends ToolbarLayout
|
| protected void onPrimaryColorChanged(boolean shouldAnimate) {
|
| super.onPrimaryColorChanged(shouldAnimate);
|
| if (mBrandColorTransitionActive) mBrandColorTransitionAnimation.cancel();
|
| - if (!shouldAnimate || !isVisualStateValidForBrandColorTransition(mVisualState)) {
|
| - return;
|
| - }
|
| +
|
| final int initialColor = mToolbarBackground.getColor();
|
| final int finalColor = getToolbarDataProvider().getPrimaryColor();
|
| if (initialColor == finalColor) return;
|
|
|
| + if (!isVisualStateValidForBrandColorTransition(mVisualState)) return;
|
| +
|
| + if (!shouldAnimate) {
|
| + updateToolbarBackground(finalColor);
|
| + return;
|
| + }
|
| +
|
| boolean shouldUseOpaque = ColorUtils.shouldUseOpaqueTextboxBackground(finalColor);
|
| final int initialAlpha = mLocationBarBackgroundAlpha;
|
| final int finalAlpha =
|
|
|