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 a5b5afd412f17b3c7c93431f5fb055f7a8003034..5dcb7d74f62a3a1dc5dac7c15000a0ab825b5431 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 |
@@ -920,6 +920,9 @@ public class ToolbarPhone extends ToolbarLayout |
mMenuButton.getHeight() - mMenuButton.getPaddingBottom()); |
translateCanvasToView(mToolbarButtonsContainer, mMenuButton, canvas); |
mTabSwitcherAnimationMenuDrawable.setAlpha(rgbAlpha); |
+ int color = mUseLightToolbarDrawables ? getResources().getColor(R.color.light_mode_tint) |
+ : getResources().getColor(R.color.dark_mode_tint); |
+ mTabSwitcherAnimationMenuDrawable.setColorFilter(color, PorterDuff.Mode.SRC_IN); |
mTabSwitcherAnimationMenuDrawable.draw(canvas); |
} |
@@ -1644,8 +1647,6 @@ public class ToolbarPhone extends ToolbarLayout |
@Override |
protected void onPrimaryColorChanged() { |
- if (!FeatureUtilities.isDocumentMode(getContext())) return; |
- |
super.onPrimaryColorChanged(); |
if (mBrandColorTransitionActive) mBrandColorTransitionAnimation.cancel(); |
if (!isVisualStateValidForBrandColorTransition(mVisualState)) { |
@@ -1843,14 +1844,18 @@ public class ToolbarPhone extends ToolbarLayout |
getProgressBar().setBackgroundColor( |
getResources().getColor(progressBarBackgroundColorResource)); |
+ ColorStateList dark = getResources().getColorStateList(R.color.dark_mode_tint); |
+ ColorStateList white = getResources().getColorStateList(R.color.light_mode_tint); |
if (mToggleTabStackButton != null) { |
mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables |
? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable); |
+ if (mTabSwitcherAnimationTabStackDrawable != null) { |
+ mTabSwitcherAnimationTabStackDrawable.setTint( |
+ mUseLightToolbarDrawables ? white : dark); |
+ } |
} |
- ColorStateList dark = getResources().getColorStateList(R.color.dark_mode_tint); |
- ColorStateList white = getResources().getColorStateList(R.color.light_mode_tint); |
if (shouldShowMenuButton()) { |
mMenuButton.setTint(mUseLightToolbarDrawables ? white : dark); |
} |