Start caching tinting ColorStateLists in Toolbar.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.toolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
@@ skipping 130 matching lines @@
     private boolean mUnfocusedLocationBarUsesTransparentBg;
 
     private int mUrlBackgroundAlpha = 255;
     private float mNtpSearchBoxScrollPercent = UNINITIALIZED_PERCENT;
     private ColorDrawable mToolbarBackground;
     private Drawable mLocationBarBackground;
     private boolean mForceDrawLocationBarBackground;
     private TabSwitcherDrawable mTabSwitcherButtonDrawable;
     private TabSwitcherDrawable mTabSwitcherButtonDrawableLight;
 
+    private final int mLightModeDefaultColor;
+    private final int mDarkModeDefaultColor;
+
     private final Rect mUrlViewportBounds = new Rect();
     private final Rect mUrlBackgroundPadding = new Rect();
     private final Rect mBackgroundOverlayBounds = new Rect();
     private final Rect mLocationBarBackgroundOffset = new Rect();
 
     private final Rect mNtpSearchBoxOriginalBounds = new Rect();
     private final Rect mNtpSearchBoxTransformedBounds = new Rect();
 
     private final int mLocationBarInsets;
     private final int mToolbarSidePadding;
@@ skipping 56 matching lines @@
      * @param context The Context in which this View object is created.
      * @param attrs The AttributeSet that was specified with this View.
      */
     public ToolbarPhone(Context context, AttributeSet attrs) {
         super(context, attrs);
         mToolbarSidePadding = getResources().getDimensionPixelOffset(
                 R.dimen.toolbar_edge_padding);
         // Insets used for the PhoneLocatioBar background drawable.
         mLocationBarInsets = getResources().getDimensionPixelSize(R.dimen.location_bar_margin_top)
                 + getResources().getDimensionPixelSize(R.dimen.location_bar_margin_bottom);
+        mLightModeDefaultColor =
+                ApiCompatibilityUtils.getColor(getResources(), R.color.light_mode_tint);
+        mDarkModeDefaultColor =
+                ApiCompatibilityUtils.getColor(getResources(), R.color.dark_mode_tint);
     }
 
     @Override
     public void onFinishInflate() {
         super.onFinishInflate();
         mPhoneLocationBar = (LocationBarPhone) findViewById(R.id.location_bar);
 
         mToolbarButtonsContainer = (ViewGroup) findViewById(R.id.toolbar_buttons);
 
         mHomeButton = (TintedImageButton) findViewById(R.id.home_button);
@@ skipping 677 matching lines @@
         // Draw the menu button if necessary.
         if (mTabSwitcherAnimationMenuDrawable != null
                 && mUrlExpansionPercent != 1f) {
             mTabSwitcherAnimationMenuDrawable.setBounds(
                     mMenuButton.getPaddingLeft(), mMenuButton.getPaddingTop(),
                     mMenuButton.getWidth() - mMenuButton.getPaddingRight(),
                     mMenuButton.getHeight() - mMenuButton.getPaddingBottom());
             translateCanvasToView(mToolbarButtonsContainer, mMenuButton, canvas);
             mTabSwitcherAnimationMenuDrawable.setAlpha(rgbAlpha);
             int color = mUseLightToolbarDrawables
-                    ? ApiCompatibilityUtils.getColor(getResources(), R.color.light_mode_tint)
-                    : ApiCompatibilityUtils.getColor(getResources(), R.color.dark_mode_tint);
+                    ? mLightModeDefaultColor
+                    : mDarkModeDefaultColor;
             mTabSwitcherAnimationMenuDrawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
             mTabSwitcherAnimationMenuDrawable.draw(canvas);
         }
 
         canvas.restore();
     }
 
     @Override
     public void doInvalidate() {
         postInvalidateOnAnimation();
@@ skipping 408 matching lines @@
         if (!visualStateChanged) return;
 
         mOverlayDrawablesVisualState = overlayState;
         mTabSwitcherAnimationBgOverlay.setColor(getToolbarColorForVisualState(
                 mOverlayDrawablesVisualState));
 
         if (shouldShowMenuButton()) {
             Resources res = getResources();
             mTabSwitcherAnimationMenuDrawable = ApiCompatibilityUtils.getDrawable(
                     res, R.drawable.btn_menu).mutate();
-            mTabSwitcherAnimationMenuDrawable.setColorFilter(isIncognito() ? Color.WHITE
-                    : ApiCompatibilityUtils.getColor(res, R.color.light_normal_color),
+            mTabSwitcherAnimationMenuDrawable.setColorFilter(
+                    isIncognito() ? mLightModeDefaultColor : mDarkModeDefaultColor,
                     PorterDuff.Mode.SRC_IN);
             ((BitmapDrawable) mTabSwitcherAnimationMenuDrawable).setGravity(Gravity.CENTER);
         }
     }
 
     @Override
     public void setOnTabSwitcherClickHandler(OnClickListener listener) {
         mTabSwitcherListener = listener;
     }
 
@@ skipping 472 matching lines @@
             mUnfocusedLocationBarUsesTransparentBg =
                     !ColorUtils.shouldUseOpaqueTextboxBackground(currentPrimaryColor);
             mUrlBackgroundAlpha = mUnfocusedLocationBarUsesTransparentBg
                     ? LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA : 255;
             progressBarBackgroundColorResource = mUseLightToolbarDrawables
                     ? R.color.progress_bar_background_white : R.color.progress_bar_background;
         }
 
         getProgressBar().setBackgroundColor(
                 ApiCompatibilityUtils.getColor(getResources(), progressBarBackgroundColorResource));
-        ColorStateList dark =
-                ApiCompatibilityUtils.getColorStateList(getResources(), R.color.dark_mode_tint);
-        ColorStateList white =
-                ApiCompatibilityUtils.getColorStateList(getResources(), R.color.light_mode_tint);
 
         if (mToggleTabStackButton != null) {
             mToggleTabStackButton.setImageDrawable(mUseLightToolbarDrawables
                     ? mTabSwitcherButtonDrawableLight : mTabSwitcherButtonDrawable);
             if (mTabSwitcherAnimationTabStackDrawable != null) {
                 mTabSwitcherAnimationTabStackDrawable.setTint(
-                        mUseLightToolbarDrawables ? white : dark);

[Yusuf, 2015/09/28 17:20:26]

setTint(int color) is API 21+. There is a DrawableCompat.setTint(Drawable, int)
which seems useful for our purposes as well. Wonder what is different between
that and our own TintedDrawable.

[aurimas (slooooooooow), 2015/09/28 20:32:56]

Filed a bug for investigating that crbug.com/536920

+                        mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
             }
         }
 
         if (shouldShowMenuButton()) {
-            mMenuButton.setTint(mUseLightToolbarDrawables ? white : dark);
+            mMenuButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
         }
         if (mHomeButton.getVisibility() != GONE) {
-            mHomeButton.setTint(mUseLightToolbarDrawables ? white : dark);
+            mHomeButton.setTint(mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint);
         }
 
         mPhoneLocationBar.updateVisualsForState();
         // Remove the side padding for incognito to ensure the badge icon aligns correctly with the
         // background of the location bar.
         if (isIncognito) {
             mPhoneLocationBar.setPadding(
                     0, mUrlBackgroundPadding.top, 0, mUrlBackgroundPadding.bottom);
         } else {
             mPhoneLocationBar.setPadding(
@@ skipping 20 matching lines @@
 
         getMenuButton().setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return mPhoneLocationBar;
     }
 }