chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java - Issue 1419533002: Roll android_tools deps

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/preferences/website/SingleCategoryPreferences.java

Issue 1419533002: Roll android_tools deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed setImageResource(0) crash Created 5 years, 2 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/preferences/privacy/PrivacyPreferences.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.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/preferences/website/SingleCategoryPreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

index 32cd4e98715296b40ed683f92e1272cbeb5efb15..3942175e88953895dbb96694662344cf3c771072 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

@@ -250,7 +250,7 @@ public class SingleCategoryPreferences extends PreferenceFragment

// Set the title and arrow icons for the header.

allowedGroup.setGroupTitle(resourceId, numAllowed);

TintedDrawable icon = TintedDrawable.constructTintedDrawable(getResources(),

- mAllowListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse);

+ mAllowListExpanded ? R.drawable.ic_expanded : R.drawable.ic_collapsed);

allowedGroup.setExpanded(mAllowListExpanded);

allowedGroup.setIcon(icon);

}

@@ -267,7 +267,7 @@ public class SingleCategoryPreferences extends PreferenceFragment

// Set the title and arrow icons for the header.

blockedGroup.setGroupTitle(R.string.website_settings_blocked_group_heading, numBlocked);

TintedDrawable icon = TintedDrawable.constructTintedDrawable(getResources(),

- mBlockListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse);

+ mBlockListExpanded ? R.drawable.ic_expanded : R.drawable.ic_collapsed);

blockedGroup.setExpanded(mBlockListExpanded);

blockedGroup.setIcon(icon);

}