| Index: chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| index 8e444b4c1052a05414d6b1f0a45629f785c87f4e..196efc97f486ea852efd1fc86af454f058fade5c 100644
|
| --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java
|
| @@ -1613,12 +1613,12 @@ public class ToolbarPhone extends ToolbarLayout
|
| }
|
|
|
| @Override
|
| - protected void onPrimaryColorChanged() {
|
| - super.onPrimaryColorChanged();
|
| + protected void checkPrimaryColorTransition() {
|
| + super.checkPrimaryColorTransition();
|
| if (mBrandColorTransitionActive) mBrandColorTransitionAnimation.cancel();
|
| final int initialColor = mToolbarBackground.getColor();
|
| final int finalColor = getToolbarDataProvider().getPrimaryColor();
|
| - if (initialColor == finalColor) return;
|
| + if (mInTabSwitcherMode || initialColor == finalColor) return;
|
| boolean shouldUseOpaque = BrandColorUtils.shouldUseOpaqueTextboxBackground(finalColor);
|
| final int initialAlpha = mUrlBackgroundAlpha;
|
| final int finalAlpha =
|
|
|