Apply Modern styling to site suggestion tiles.

Bug: 739664
Change-Id: I0f847bec2b9034206588aad4aedfc3703d49ee7c
Reviewed-on: https://chromium-review.googlesource.com/571001
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486752}

chrome/android/java/res/drawable/tile_view_icon_background_modern.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/default_primary_color" />
+</shape>

chrome/android/java/res/layout/tile_view.xml

@@ -12,6 +12,16 @@
     android:paddingStart="4dp"
     android:paddingEnd="4dp" >
 
+    <!-- Icon background for the Modern layout. -->
+    <View
+        android:id="@+id/tile_view_icon_background"
+        android:layout_width="@dimen/tile_view_icon_size"
+        android:layout_height="@dimen/tile_view_icon_size"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/tile_view_icon_margin_top"
+        android:background="@drawable/tile_view_icon_background_modern"
+        android:visibility="gone" />
+
     <!-- The main icon. -->
     <ImageView
         android:id="@+id/tile_view_icon"

chrome/android/java/res/values/dimens.xml

@@ -301,8 +301,10 @@
     <dimen name="tile_view_width">80dp</dimen>
     <dimen name="tile_view_width_condensed">64dp</dimen>
     <dimen name="tile_view_icon_size">48dp</dimen>
+    <dimen name="tile_view_icon_size_modern">28dp</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_modern">22dp</dimen>
     <dimen name="tile_view_offline_badge_size">24dp</dimen>
     <dimen name="tile_view_title_margin_top">66dp</dimen>
     <dimen name="tile_view_title_margin_top_condensed">62dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/suggestions/TileGroup.java

@@ -224,10 +224,18 @@ public class TileGroup implements MostVisitedSites.Observer {
         mMinIconSize = Math.min(mDesiredIconSize, ICON_MIN_SIZE_PX);
         int desiredIconSizeDp =
                 Math.round(mDesiredIconSize / resources.getDisplayMetrics().density);
+
+        int cornerRadiusDp;
+        if (SuggestionsConfig.useModern()) {
+            cornerRadiusDp = desiredIconSizeDp / 2;
+        } else {
+            cornerRadiusDp = ICON_CORNER_RADIUS_DP;
+        }
+
         int iconColor =
                 ApiCompatibilityUtils.getColor(resources, R.color.default_favicon_background_color);
         mIconGenerator = new RoundedIconGenerator(mContext, desiredIconSizeDp, desiredIconSizeDp,
-                ICON_CORNER_RADIUS_DP, iconColor, ICON_TEXT_SIZE_DP);
+                cornerRadiusDp, iconColor, ICON_TEXT_SIZE_DP);
 
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_OFFLINE_PAGES_FEATURE_NAME)) {
             mOfflineModelObserver = new OfflineModelObserver(offlinePageBridge);

chrome/android/java/src/org/chromium/chrome/browser/suggestions/TileView.java

@@ -24,6 +24,7 @@ public class TileView extends FrameLayout {
     private String mUrl;
 
     private TextView mTitleView;
+    private View mIconBackgroundView;
     private ImageView mIconView;
     private ImageView mBadgeView;
 
@@ -39,6 +40,7 @@ public class TileView extends FrameLayout {
         super.onFinishInflate();
 
         mTitleView = (TextView) findViewById(R.id.tile_view_title);
+        mIconBackgroundView = (View) findViewById(R.id.tile_view_icon_background);
         mIconView = (ImageView) findViewById(R.id.tile_view_icon);
         mBadgeView = (ImageView) findViewById(R.id.offline_badge);
     }
@@ -54,10 +56,18 @@ public class TileView extends FrameLayout {
         mTitleView.setLines(titleLines);
         mUrl = tile.getUrl();
 
-        // TODO(mvanouwerkerk): Move this code to xml - https://crbug.com/695817.
-        if (condensed) {
-            Resources res = getResources();
+        Resources res = getResources();
 
+        if (SuggestionsConfig.useModern()) {
+            mIconBackgroundView.setVisibility(View.VISIBLE);
+            LayoutParams iconParams = (LayoutParams) mIconView.getLayoutParams();
+            iconParams.width = res.getDimensionPixelOffset(R.dimen.tile_view_icon_size_modern);
+            iconParams.height = res.getDimensionPixelOffset(R.dimen.tile_view_icon_size_modern);
+            iconParams.setMargins(
+                    0, res.getDimensionPixelOffset(R.dimen.tile_view_icon_margin_top_modern), 0, 0);
+            mIconView.setLayoutParams(iconParams);
+        } else if (condensed) {
+            // TODO(mvanouwerkerk): Move this code to xml - https://crbug.com/695817.
             setPadding(0, 0, 0, 0);
             LayoutParams tileParams = (LayoutParams) getLayoutParams();
             tileParams.width = res.getDimensionPixelOffset(R.dimen.tile_view_width_condensed);

chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java

@@ -57,7 +57,8 @@ import java.util.List;
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-@Features(@Features.Register(ChromeFeatureList.NTP_OFFLINE_PAGES_FEATURE_NAME))
+@Features({@Features.Register(ChromeFeatureList.NTP_OFFLINE_PAGES_FEATURE_NAME),
+        @Features.Register(ChromeFeatureList.SUGGESTIONS_HOME_MODERN_LAYOUT)})
 public class TileGroupTest {
     private static final int MAX_TILES_TO_FETCH = 4;
     private static final int TILE_TITLE_LINES = 1;