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

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

Issue 1372653002: Start caching tinting ColorStateLists in Toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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
Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
index 6f5ec3ca5e5cf170a2b83f8b43bc36463244644e..fd84aa5bb2bbd976871ffd8b201a52743cd11633 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.toolbar;
import android.annotation.SuppressLint;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
@@ -18,6 +19,7 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ProgressBar;
+import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
import org.chromium.chrome.browser.compositor.Invalidator;
@@ -48,6 +50,9 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
protected TintedImageButton mMenuButton;
private AppMenuButtonHelper mAppMenuButtonHelper;
+ protected final ColorStateList mDarkModeTint;
+ protected final ColorStateList mLightModeTint;
+
private ToolbarDataProvider mToolbarDataProvider;
private ToolbarTabController mToolbarTabController;
private ToolbarProgressBar mProgressBar;
@@ -68,6 +73,10 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
super(context, attrs);
mToolbarHeightWithoutShadow = getResources().getDimensionPixelOffset(
getToolbarHeightWithoutShadowResId());
+ mDarkModeTint =
+ ApiCompatibilityUtils.getColorStateList(getResources(), R.color.dark_mode_tint);
+ mLightModeTint =
+ ApiCompatibilityUtils.getColorStateList(getResources(), R.color.light_mode_tint);
}
@Override

Powered by Google App Engine
This is Rietveld 408576698