chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java - Issue 1245333002: [Andorid] Migrate to ClipDrawable progress bar.

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/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

Issue 1245333002: [Andorid] Migrate to ClipDrawable progress bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix flaky Chrome shell tests. Created 5 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/res/values/colors.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

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

index 21a527ffaca4dc9a2f4b7dc89cecd2dd8cf6c173..e8f61173e12f8e61e48260c74ac337092574e170 100644

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

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

@@ -306,10 +306,10 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,

mTitleBar.setTextColor(titleTextColor);

if (getProgressBar() != null) {

- int progressBarResource = !mUseDarkColors

- ? R.drawable.progress_bar_white : R.drawable.progress_bar;

- getProgressBar().setProgressDrawable(

- ApiCompatibilityUtils.getDrawable(getResources(), progressBarResource));

+ int progressBarBackgroundColorResource = mUseDarkColors

+ ? R.color.progress_bar_background : R.color.progress_bar_background_white;

+ getProgressBar().setBackgroundColor(

+ getResources().getColor(progressBarBackgroundColorResource));

}