chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java - Issue 1148323009: Don't update primary color if brand color is not enabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1148323009: Don't update primary color if brand color is not enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

index faa46edb12da39c4b916093103bef9551f5474ec..adb8aab177c07a6b195df264123de6d8c61f138c 100644

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -1626,6 +1626,8 @@ public class ToolbarPhone extends ToolbarLayout

@Override

protected void onPrimaryColorChanged() {

+ if (!getToolbarDataProvider().isUsingBrandColor()) return;

super.onPrimaryColorChanged();

if (mBrandColorTransitionActive) mBrandColorTransitionAnimation.cancel();

if (!isVisualStateValidForBrandColorTransition(mVisualState)) {

« no previous file with comments | « no previous file | no next file » | no next file with comments »