Add new NTP layout with snippet cards and hide it behind a flag

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardItemViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardViewHolder.java
similarity index 55%
rename from chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardItemViewHolder.java
rename to chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardViewHolder.java
index d032d52caff3d322c48fce7c0c0f9c20fa903159..003c2255f206ebf0dbcf87aa2ff882757775645a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardItemViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetCardViewHolder.java
@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.ntp.snippets;
 
+import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -14,18 +14,17 @@ import android.widget.TextView;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ntp.NewTabPageCardsManager.NewTabPageListItem;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
-import org.chromium.chrome.browser.ntp.snippets.SnippetsManager.SnippetArticle;
-import org.chromium.chrome.browser.ntp.snippets.SnippetsManager.SnippetListItem;
+import org.chromium.chrome.browser.ntp.NewTabPageViewHolder;
 
 /**
  * A class that represents the view for a single card snippet.
  */
-class SnippetCardItemViewHolder extends SnippetListItemViewHolder implements View.OnClickListener {
+public class SnippetCardViewHolder extends NewTabPageViewHolder implements View.OnClickListener {
     public TextView mHeadlineTextView;
     public TextView mPublisherTextView;
     public TextView mArticleSnippetTextView;
-    public TextView mReadMoreLinkTextView;
     public ImageView mThumbnailView;
     public String mUrl;
     public int mPosition;
@@ -47,7 +46,7 @@ class SnippetCardItemViewHolder extends SnippetListItemViewHolder implements Vie
      * @param cardView The View for the snippet card
      * @param manager The SnippetsManager object used to open an article
      */
-    public SnippetCardItemViewHolder(View cardView, SnippetsManager manager) {
+    public SnippetCardViewHolder(View cardView, SnippetsManager manager) {
         super(cardView, manager);
 
         cardView.setOnClickListener(this);
@@ -55,19 +54,6 @@ class SnippetCardItemViewHolder extends SnippetListItemViewHolder implements Vie
         mHeadlineTextView = (TextView) cardView.findViewById(R.id.article_headline);
         mPublisherTextView = (TextView) cardView.findViewById(R.id.article_publisher);
         mArticleSnippetTextView = (TextView) cardView.findViewById(R.id.article_snippet);
-        mReadMoreLinkTextView = (TextView) cardView.findViewById(R.id.read_more_link);
-        mReadMoreLinkTextView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                loadUrl(mUrl);
-                RecordUserAction.record("MobileNTP.Snippets.Click");
-                RecordHistogram.recordSparseSlowlyHistogram(
-                        "NewTabPage.Snippets.CardClicked", mPosition);
-                RecordHistogram.recordEnumeratedHistogram(SnippetsManager.SNIPPETS_STATE_HISTOGRAM,
-                        SnippetsManager.SNIPPETS_CLICKED, SnippetsManager.NUM_SNIPPETS_ACTIONS);
-                NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_SNIPPET);
-            }
-        });
         cardView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
             @Override
             public void onViewAttachedToWindow(View v) {
@@ -82,26 +68,22 @@ class SnippetCardItemViewHolder extends SnippetListItemViewHolder implements Vie
 
     @Override
     public void onClick(View v) {
-        // Toggle visibility of snippet text
-        int visibility =
-                (mArticleSnippetTextView.getVisibility() == View.GONE) ? View.VISIBLE : View.GONE;
-        mArticleSnippetTextView.setVisibility(visibility);
-        mReadMoreLinkTextView.setVisibility(visibility);
-
-        String action = visibility == View.VISIBLE ? "MobileNTP.Snippets.ShowMore"
-                                                   : "MobileNTP.Snippets.ShowLess";
-        String histogram = visibility == View.VISIBLE ? "NewTabPage.Snippets.CardExpanded"
-                                                      : "NewTabPage.Snippets.CardHidden";
-        RecordUserAction.record(action);
-        RecordHistogram.recordSparseSlowlyHistogram(histogram, mPosition);
+        loadUrl(mUrl);
+        RecordUserAction.record("MobileNTP.Snippets.Click");
+        RecordHistogram.recordSparseSlowlyHistogram("NewTabPage.Snippets.CardClicked", mPosition);
+        RecordHistogram.recordEnumeratedHistogram(SnippetsManager.SNIPPETS_STATE_HISTOGRAM,
+                SnippetsManager.SNIPPETS_CLICKED, SnippetsManager.NUM_SNIPPETS_ACTIONS);
+        NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_SNIPPET);
     }
 
     @Override
-    public void onBindViewHolder(SnippetListItem snippetItem) {
-        SnippetArticle item = (SnippetArticle) snippetItem;
+    public void onBindViewHolder(NewTabPageListItem article) {
+        SnippetArticle item = (SnippetArticle) article;
 
         mHeadlineTextView.setText(item.mTitle);
-        mPublisherTextView.setText(item.mPublisher);
+        mPublisherTextView.setText(
+                DateUtils.getRelativeTimeSpanString(item.mTimestamp, System.currentTimeMillis(),
+                        DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE));
         mArticleSnippetTextView.setText(item.mPreviewText);
         mUrl = item.mUrl;
         mPosition = item.mPosition;