Let Custom Tabs Use Light Progressbar for Dark Toolbar

chrome/android/java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java
index 669d4cf1783f39d724de17041593bf56e78a7d44..7f2f992a465f578fd96e7c99b3df38cd4bb3f3c6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java
@@ -36,7 +36,7 @@ public class ClipDrawableProgressBar extends ImageView {
     // http://developer.android.com/reference/android/graphics/drawable/ClipDrawable.html
     private static final int CLIP_DRAWABLE_MAX = 10000;
 
-    private int mProgressBarColor = Color.TRANSPARENT;
+    private final ColorDrawable mForegroundDrawable;
     private int mBackgroundColor = Color.TRANSPARENT;
     private float mProgress;
     private int mDesiredVisibility;
@@ -57,28 +57,25 @@ public class ClipDrawableProgressBar extends ImageView {
      */
     public ClipDrawableProgressBar(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init(context, attrs, 0);
-    }
-
-    private void init(Context context, AttributeSet attrs, int defStyle) {
         mDesiredVisibility = getVisibility();
 
         assert attrs != null;
         TypedArray a = context.obtainStyledAttributes(
-                attrs, R.styleable.ClipDrawableProgressBar, defStyle, 0);
+                attrs, R.styleable.ClipDrawableProgressBar, 0, 0);
 
-        mProgressBarColor = a.getColor(
+        int foregroundColor = a.getColor(
                 R.styleable.ClipDrawableProgressBar_progressBarColor, Color.TRANSPARENT);
         mBackgroundColor = a.getColor(
                 R.styleable.ClipDrawableProgressBar_backgroundColor, Color.TRANSPARENT);
-        assert mProgressBarColor != Color.TRANSPARENT;
-        assert Color.alpha(mProgressBarColor) == 255
+        assert foregroundColor != Color.TRANSPARENT;
+        assert Color.alpha(foregroundColor) == 255
                 : "Currently ClipDrawableProgressBar only supports opaque progress bar color.";
 
         a.recycle();
 
-        setImageDrawable(new ClipDrawable(new ColorDrawable(mProgressBarColor), Gravity.START,
-                ClipDrawable.HORIZONTAL));
+        mForegroundDrawable = new ColorDrawable(foregroundColor);
+        setImageDrawable(
+                new ClipDrawable(mForegroundDrawable, Gravity.START, ClipDrawable.HORIZONTAL));
         setBackgroundColor(mBackgroundColor);
     }
 
@@ -116,8 +113,9 @@ public class ClipDrawableProgressBar extends ImageView {
      * @param drawingInfoOut An instance that the result will be written.
      */
     public void getDrawingInfo(DrawingInfo drawingInfoOut) {
+        int foregroundColor = mForegroundDrawable.getColor();
         float effectiveAlpha = getVisibility() == VISIBLE ? getAlpha() : 0.0f;
-        drawingInfoOut.progressBarColor = applyAlpha(mProgressBarColor, effectiveAlpha);
+        drawingInfoOut.progressBarColor = applyAlpha(foregroundColor, effectiveAlpha);
         drawingInfoOut.progressBarBackgroundColor = applyAlpha(mBackgroundColor, effectiveAlpha);
 
         if (ViewCompat.getLayoutDirection(this) == LAYOUT_DIRECTION_LTR) {
@@ -179,6 +177,14 @@ public class ClipDrawableProgressBar extends ImageView {
         mBackgroundColor = color;
     }
 
+    /**
+     * Sets the color for the foreground (i.e. the moving part) of the progress bar.
+     * @param color The new color of the progress bar foreground.
+     */
+    public void setForegroundColor(int color) {
+        mForegroundDrawable.setColor(color);
+    }
+
     @Override
     protected boolean onSetAlpha(int alpha) {
         updateInternalVisibility();