| 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 4cec55f95d73315301a1491e0765cd4d602d6250..56f5de2ee1a0a51a2d1872f3270ccc1ce02404ed 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
|
| @@ -1990,8 +1990,7 @@ public class ToolbarPhone extends ToolbarLayout
|
| visualStateChanged = true;
|
| } else {
|
| updateToolbarBackground(VisualState.BRAND_COLOR);
|
| - getProgressBar().setBackgroundColor(
|
| - ColorUtils.getLightProgressbarBackground(currentPrimaryColor));
|
| + getProgressBar().setThemeColor(currentPrimaryColor, isIncognito());
|
| }
|
| }
|
|
|
| @@ -2010,16 +2009,17 @@ public class ToolbarPhone extends ToolbarLayout
|
| mUseLightToolbarDrawables = false;
|
| mUnfocusedLocationBarUsesTransparentBg = false;
|
| mUrlBackgroundAlpha = 255;
|
| - int progressBarBackgroundColor = mProgressBackBackgroundColor;
|
| updateToolbarBackground(mVisualState);
|
| if (isInTabSwitcherMode) {
|
| mUseLightToolbarDrawables = true;
|
| mUrlBackgroundAlpha = LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA;
|
| - progressBarBackgroundColor = mProgressBackBackgroundColorWhite;
|
| + getProgressBar().setBackgroundColor(mProgressBackBackgroundColorWhite);
|
| + getProgressBar().setForegroundColor(ApiCompatibilityUtils.getColor(getResources(),
|
| + R.color.progress_bar_foreground_white));
|
| } else if (isIncognito()) {
|
| mUseLightToolbarDrawables = true;
|
| mUrlBackgroundAlpha = LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA;
|
| - progressBarBackgroundColor = mProgressBackBackgroundColorWhite;
|
| + getProgressBar().setThemeColor(currentPrimaryColor, true);
|
| } else if (mVisualState == VisualState.BRAND_COLOR) {
|
| mUseLightToolbarDrawables =
|
| ColorUtils.shoudUseLightForegroundOnBackground(currentPrimaryColor);
|
| @@ -2027,17 +2027,13 @@ public class ToolbarPhone extends ToolbarLayout
|
| !ColorUtils.shouldUseOpaqueTextboxBackground(currentPrimaryColor);
|
| mUrlBackgroundAlpha = mUnfocusedLocationBarUsesTransparentBg
|
| ? LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA : 255;
|
| - progressBarBackgroundColor =
|
| - ColorUtils.getLightProgressbarBackground(currentPrimaryColor);
|
| + getProgressBar().setThemeColor(currentPrimaryColor, false);
|
| + } else {
|
| + getProgressBar().setBackgroundColor(mProgressBackBackgroundColor);
|
| + getProgressBar().setForegroundColor(ApiCompatibilityUtils.getColor(getResources(),
|
| + R.color.progress_bar_foreground));
|
| }
|
|
|
| - getProgressBar().setBackgroundColor(progressBarBackgroundColor);
|
| - int progressBarForegroundColor = ApiCompatibilityUtils.getColor(getResources(),
|
| - mUseLightToolbarDrawables
|
| - ? R.color.progress_bar_foreground_white
|
| - : R.color.progress_bar_foreground);
|
| - getProgressBar().setForegroundColor(progressBarForegroundColor);
|
| -
|
| if (mToggleTabStackButton != null) {
|
| mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables
|
| ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
|
|
|