Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

Issue 1149213003: Don't update color in tabSwitcher Mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed extra logic keeping the fix Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e54b4e8b6a955ff18aed4ee4c1d5d85c31c5243e 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
@@ -1618,7 +1618,7 @@ public class ToolbarPhone extends ToolbarLayout
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 =
@@ -1802,7 +1802,6 @@ public class ToolbarPhone extends ToolbarLayout
mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables
? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
-
ColorStateList dark = getResources().getColorStateList(R.color.dark_mode_tint);
ColorStateList white = getResources().getColorStateList(R.color.light_mode_tint);
if (shouldShowMenuButton()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698