Commit 07bb6c7f authored by Matthew Jones's avatar Matthew Jones Committed by Commit Bot

Don't tint favicon bitmaps in accessibility tab switcher

This patch fixes the tint applied to all icons in the accessibility
tab switcher when modern is not enabled. If the icon is a bitmap
(if it is an actual favicon from the site) it does not get tinted.

Bug: 817914
Change-Id: Iae7baa6be32f15098d354c50b7f09f152859215e
Reviewed-on: https://chromium-review.googlesource.com/1010827
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550695}
parent 2b75a622
......@@ -349,13 +349,14 @@ public class AccessibilityTabModelListItem extends FrameLayout implements OnClic
if (mTab != null) {
Bitmap bitmap = mTab.getFavicon();
if (bitmap != null) {
// Don't tint favicon bitmaps.
((TintedImageView) mFaviconView).setTint(null);
mFaviconView.setImageBitmap(bitmap);
} else {
mFaviconView.setImageResource(R.drawable.ic_globe_24dp);
}
if (FeatureUtilities.isChromeModernDesignEnabled()) {
((TintedImageView) mFaviconView).setTint(bitmap != null ? null : mDarkIconColor);
if (FeatureUtilities.isChromeModernDesignEnabled()) {
((TintedImageView) mFaviconView).setTint(mDarkIconColor);
}
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment