Commit 2aa568a4 authored by Michael van Ouwerkerk's avatar Michael van Ouwerkerk Committed by Commit Bot

Slightly enlarge the tile monograms in Chrome Home.

Bug: 760618
Change-Id: I9670fc2f4ab36e080d67ed41d8503d5ca2a17b73
Reviewed-on: https://chromium-review.googlesource.com/684734Reviewed-by: default avatarBernhard Bauer <bauerb@chromium.org>
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504400}
parent a34ccb08
...@@ -310,9 +310,11 @@ ...@@ -310,9 +310,11 @@
<dimen name="tile_view_width_condensed">64dp</dimen> <dimen name="tile_view_width_condensed">64dp</dimen>
<dimen name="tile_view_icon_size">48dp</dimen> <dimen name="tile_view_icon_size">48dp</dimen>
<dimen name="tile_view_icon_size_modern">24dp</dimen> <dimen name="tile_view_icon_size_modern">24dp</dimen>
<dimen name="tile_view_monogram_size_modern">26dp</dimen>
<dimen name="tile_view_icon_margin_top">12dp</dimen> <dimen name="tile_view_icon_margin_top">12dp</dimen>
<dimen name="tile_view_icon_margin_top_condensed">8dp</dimen> <dimen name="tile_view_icon_margin_top_condensed">8dp</dimen>
<dimen name="tile_view_icon_margin_top_modern">19dp</dimen> <dimen name="tile_view_icon_margin_top_modern">19dp</dimen>
<dimen name="tile_view_monogram_margin_top_modern">18dp</dimen>
<dimen name="tile_view_icon_background_margin_top_modern">7dp</dimen> <dimen name="tile_view_icon_background_margin_top_modern">7dp</dimen>
<dimen name="tile_view_offline_badge_size">24dp</dimen> <dimen name="tile_view_offline_badge_size">24dp</dimen>
<dimen name="tile_view_offline_badge_size_modern">16dp</dimen> <dimen name="tile_view_offline_badge_size_modern">16dp</dimen>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.suggestions; package org.chromium.chrome.browser.suggestions;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.FrameLayout; import android.widget.FrameLayout;
...@@ -13,6 +14,7 @@ import android.widget.TextView; ...@@ -13,6 +14,7 @@ import android.widget.TextView;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ntp.TitleUtil; import org.chromium.chrome.browser.ntp.TitleUtil;
import org.chromium.chrome.browser.util.FeatureUtilities;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -88,6 +90,24 @@ public class TileView extends FrameLayout { ...@@ -88,6 +90,24 @@ public class TileView extends FrameLayout {
*/ */
public void renderIcon(Tile tile) { public void renderIcon(Tile tile) {
mIconView.setImageDrawable(tile.getIcon()); mIconView.setImageDrawable(tile.getIcon());
if (!FeatureUtilities.isChromeHomeEnabled()) return;
// Slightly enlarge the monogram.
MarginLayoutParams params = (MarginLayoutParams) mIconView.getLayoutParams();
Resources resources = getResources();
if (tile.getType() == TileVisualType.ICON_COLOR
|| tile.getType() == TileVisualType.ICON_DEFAULT) {
params.width = resources.getDimensionPixelSize(R.dimen.tile_view_monogram_size_modern);
params.height = resources.getDimensionPixelSize(R.dimen.tile_view_monogram_size_modern);
params.topMargin =
resources.getDimensionPixelSize(R.dimen.tile_view_monogram_margin_top_modern);
} else {
params.width = resources.getDimensionPixelSize(R.dimen.tile_view_icon_size_modern);
params.height = resources.getDimensionPixelSize(R.dimen.tile_view_icon_size_modern);
params.topMargin =
resources.getDimensionPixelSize(R.dimen.tile_view_icon_margin_top_modern);
}
mIconView.setLayoutParams(params);
} }
/** Shows or hides the offline badge to reflect the offline availability of the {@link Tile}. */ /** Shows or hides the offline badge to reflect the offline availability of the {@link Tile}. */
......
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