Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3849)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

Issue 2374753002: Track when fallback icon color is the default. (Closed)
Patch Set: Created 4 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
Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
index 2426ef7972aeec02e7ee04d14f418120ec759ac2..cfa0d650e6193d0bb7ebdb5cea97114e28310672 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
@@ -35,6 +35,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
+import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.Callback;
import org.chromium.base.Log;
import org.chromium.base.VisibleForTesting;
@@ -1057,9 +1058,10 @@ public class NewTabPageView extends FrameLayout
mMinIconSize = Math.min(mDesiredIconSize, ICON_MIN_SIZE_PX);
int desiredIconSizeDp = Math.round(
mDesiredIconSize / res.getDisplayMetrics().density);
- mIconGenerator = new RoundedIconGenerator(
- context, desiredIconSizeDp, desiredIconSizeDp, ICON_CORNER_RADIUS_DP,
- ICON_BACKGROUND_COLOR, ICON_TEXT_SIZE_DP);
+ int iconColor = ApiCompatibilityUtils.getColor(
+ getResources(), R.color.default_favicon_background_color);
+ mIconGenerator = new RoundedIconGenerator(context, desiredIconSizeDp, desiredIconSizeDp,
+ ICON_CORNER_RADIUS_DP, iconColor, ICON_TEXT_SIZE_DP);
}
public int getNumberOfTiles(boolean searchProviderHasLogo) {
@@ -1090,13 +1092,14 @@ public class NewTabPageView extends FrameLayout
}
@Override
- public void onLargeIconAvailable(Bitmap icon, int fallbackColor) {
+ public void onLargeIconAvailable(
+ Bitmap icon, int fallbackColor, boolean isDefaultColor) {
if (icon == null) {
mIconGenerator.setBackgroundColor(fallbackColor);
icon = mIconGenerator.generateIconForUrl(mItem.getUrl());
mItemView.setIcon(new BitmapDrawable(getResources(), icon));
- mItem.setTileType(fallbackColor == ICON_BACKGROUND_COLOR
- ? MostVisitedTileType.ICON_DEFAULT : MostVisitedTileType.ICON_COLOR);
+ mItem.setTileType(isDefaultColor ? MostVisitedTileType.ICON_DEFAULT
+ : MostVisitedTileType.ICON_COLOR);
} else {
RoundedBitmapDrawable roundedIcon = RoundedBitmapDrawableFactory.create(
getResources(), icon);
@@ -1138,7 +1141,7 @@ public class NewTabPageView extends FrameLayout
Log.d(TAG, "Image decoding failed: %s", item.getWhitelistIconPath());
return false;
}
- iconCallback.onLargeIconAvailable(bitmap, Color.BLACK);
+ iconCallback.onLargeIconAvailable(bitmap, Color.BLACK, false);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698