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

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

Index: chrome/android/java/res/layout/new_tab_page_layout.xml
diff --git a/chrome/android/java/res/layout/new_tab_page_layout.xml b/chrome/android/java/res/layout/new_tab_page_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8488918950a4abf04a4ec3c714de6774a13d64f
--- /dev/null
+++ b/chrome/android/java/res/layout/new_tab_page_layout.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>

[mcwilliams, 2016/03/21 12:45:50]

Is there a way to preserve the history from new_page_tab.xml as this is a copy
paste

[Bernhard Bauer, 2016/03/21 15:13:56]

You could try running `git cl upload` with the --similarity option. But even if
you don't, Git doesn't track file copying/renaming (it only keeps track of file
contents and uses heuristics when calculating diffs), so it only matters for
purposes of this review.

[newt (away), 2016/03/23 05:29:37]

Also, the change in indentation will probably thwart all efforts to get git to
recognize that this layout was moved from another file.

+<!-- Copyright 2016 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. -->
+<org.chromium.chrome.browser.ntp.NewTabPageLayout

[newt (away), 2016/03/23 05:29:37]

were there any changes here, or was this a pure move?

[May, 2016/03/23 19:22:55]

This was a pure move.

+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:chrome="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/ntp_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:paddingTop="@dimen/toolbar_height_no_shadow"
+    android:visibility="gone"
+    chrome:maxWidth="692dp" >
+
+    <!-- Spacer. Note: this must have layout_weight="1" and the other spacers must have
+         layout_weight="0". The NewTabPageLayout will redistribute the extra space between
+         them. -->
+    <View
+        android:id="@+id/ntp_top_spacer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="invisible" />
+
+    <!-- Search provider logo -->
+    <org.chromium.chrome.browser.ntp.LogoView
+        android:id="@+id/search_provider_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/ntp_logo_height"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="26dp"
+        android:layout_marginBottom="30dp"
+        android:src="@drawable/google_logo" />
+
+    <!-- Search box -->
+    <LinearLayout
+        android:id="@+id/search_box"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="center_vertical"
+        android:background="@drawable/bg_ntp_search_box"
+        android:orientation="horizontal" >
+        <EditText
+            android:id="@+id/search_box_text"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="12dp"
+            android:layout_weight="1"
+            android:background="@null"
+            android:ellipsize="end"
+            android:focusableInTouchMode="false"
+            android:gravity="center_vertical"
+            android:inputType="text"
+            android:singleLine="true"
+            android:textSize="@dimen/location_bar_url_text_size" />
+        <org.chromium.chrome.browser.widget.TintedImageView
+            android:id="@+id/voice_search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:contentDescription="@string/accessibility_toolbar_btn_mic"
+            android:src="@drawable/btn_mic" />
+    </LinearLayout>
+
+    <!-- Spacer -->
+    <View
+        android:id="@+id/ntp_middle_spacer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="0"
+        android:visibility="invisible" />
+
+    <!-- Document mode opt out promo -->
+    <ViewStub
+        android:id="@+id/opt_out_promo_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@+id/opt_out_promo"
+        android:layout="@layout/opt_out_promo" />
+
+    <!-- Most visited items -->
+    <org.chromium.chrome.browser.ntp.MostVisitedLayout
+        android:id="@+id/most_visited_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_gravity="center_horizontal"
+        android:paddingTop="@dimen/most_visited_layout_padding_top"
+        android:paddingBottom="4dp" />
+
+    <!-- Most visited items placeholder -->
+    <ViewStub
+        android:id="@+id/most_visited_placeholder_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:inflatedId="@+id/most_visited_placeholder"
+        android:layout="@layout/most_visited_placeholder" />
+
+    <!-- Spacer -->
+    <View
+        android:id="@+id/ntp_bottom_spacer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="0"
+        android:visibility="invisible" />
+
+    <View
+        android:id="@+id/no_search_logo_spacer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="gone" />
+
+    <View
+        android:id="@+id/ntp_scroll_spacer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone" />
+</org.chromium.chrome.browser.ntp.NewTabPageLayout>