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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java

Issue 2156673002: Disallow theme colors with luminance > 0.94 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « chrome/android/java/src/org/chromium/chrome/browser/util/ColorUtils.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
index 026484db9880aacf161183b0740aabfd34546179..6d2cfb09fe2a22f7fcbb2ade28273fbc5ca8f74d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
@@ -391,7 +391,8 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
mThemeColor = color;
// The default toolbar has specific colors to use.
- if (ColorUtils.isUsingDefaultToolbarColor(getResources(), color) && !isIncognito) {
+ if ((ColorUtils.isUsingDefaultToolbarColor(getResources(), color)
+ || !ColorUtils.isValidThemeColor(color)) && !isIncognito) {
setForegroundColor(ApiCompatibilityUtils.getColor(getResources(),
R.color.progress_bar_foreground));
setBackgroundColor(ApiCompatibilityUtils.getColor(getResources(),
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/util/ColorUtils.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698