chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java - Issue 1328743003: Update getColorStateList calls that were deprecated in M.

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/ToolbarTablet.java

Issue 1328743003: Update getColorStateList calls that were deprecated in M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/widget/TintedDrawable.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/ToolbarTablet.java

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

index 9e4da7a24566bdd9c45ec27cdecdbfef4c3067de..31b0ad711e399a82590b77a73b31ee2e0f52b75d 100644

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

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

@@ -292,8 +292,10 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {

setBackgroundResource(incognito

? R.color.incognito_primary_color : R.color.default_primary_color);

- ColorStateList dark = getResources().getColorStateList(R.color.dark_mode_tint);

- ColorStateList white = getResources().getColorStateList(R.color.light_mode_tint);

+ ColorStateList dark =

+ ApiCompatibilityUtils.getColorStateList(getResources(), R.color.dark_mode_tint);

+ ColorStateList white = ApiCompatibilityUtils.getColorStateList(getResources(),

+ R.color.light_mode_tint);

mMenuButton.setTint(incognito ? white : dark);

mHomeButton.setTint(incognito ? white : dark);

mBackButton.setTint(incognito ? white : dark);

@@ -337,8 +339,10 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {

mReloadButton.setContentDescription(getContext().getString(

R.string.accessibility_btn_refresh));

}

- ColorStateList dark = getResources().getColorStateList(R.color.dark_mode_tint);

- ColorStateList white = getResources().getColorStateList(R.color.light_mode_tint);

+ ColorStateList dark = ApiCompatibilityUtils.getColorStateList(getResources(),

+ R.color.dark_mode_tint);

+ ColorStateList white = ApiCompatibilityUtils.getColorStateList(getResources(),

+ R.color.light_mode_tint);

mReloadButton.setTint(isIncognito() ? white : dark);

mReloadButton.setEnabled(!mInTabSwitcherwMode);

}

@@ -353,7 +357,7 @@ public class ToolbarTablet extends ToolbarLayout implements OnClickListener {

} else {

mBookmarkButton.setImageResource(R.drawable.btn_star);

}

- ColorStateList tint = getResources().getColorStateList(tintColor);

+ ColorStateList tint = ApiCompatibilityUtils.getColorStateList(getResources(), tintColor);

mBookmarkButton.setTint(tint);

mBookmarkButton.setEnabled(editingAllowed);

}