Make the narrow version of the Android Incognito NTP follow the spec

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

Index: chrome/android/java/res/layout/new_tab_page_incognito_md.xml
diff --git a/chrome/android/java/res/layout/new_tab_page_incognito_md.xml b/chrome/android/java/res/layout/new_tab_page_incognito_md.xml
index e2d9b726ef3c5564739dd8765073867c2e96cc31..2e1a7708b435e3bc5a68694e65f0b8898714374f 100644
--- a/chrome/android/java/res/layout/new_tab_page_incognito_md.xml
+++ b/chrome/android/java/res/layout/new_tab_page_incognito_md.xml
@@ -25,53 +25,51 @@
         android:contentDescription="@string/accessibility_new_incognito_tab_page" >
 
         <LinearLayout
+            android:id="@+id/new_tab_incognito_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingStart="32dp"
-            android:paddingEnd="32dp"
-            android:paddingTop="24dp"
-            android:paddingBottom="16dp" >
+            android:gravity="start"
+            android:orientation="vertical">
 
             <ImageView
+                android:id="@+id/new_tab_incognito_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="19dp"
                 android:contentDescription="@null"
-                android:src="@drawable/incognito_splash"/>
+                android:src="@drawable/incognito_splash" />
 
             <TextView
+                android:id="@+id/new_tab_incognito_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-light"
-                android:text="@string/new_tab_incognito_header"
+                android:text="@string/new_tab_otr_title"
+                android:textColor="@color/incognito_header" />
+
+            <TextView
+                android:id="@+id/new_tab_incognito_subtitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-light"
+                android:text="@string/new_tab_otr_subtitle"
                 android:textColor="@color/incognito_header"
-                android:textSize="24sp" />
+                android:lineSpacingExtra="6sp" />
 
             <TextView
                 android:id="@+id/new_tab_incognito_features"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginBottom="10dp"
-                android:maxWidth="660dp"
                 android:singleLine="false"
                 android:textColor="@color/incognito_text"
-                android:textSize="14sp"
-                android:lineSpacingMultiplier="1.2" />
+                android:lineSpacingExtra="6sp" />
 
             <TextView
                 android:id="@+id/new_tab_incognito_warning"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginBottom="10dp"
-                android:maxWidth="660dp"
                 android:singleLine="false"
                 android:textColor="@color/incognito_text"
-                android:textSize="14sp"
-                android:lineSpacingMultiplier="1.2" />
+                android:lineSpacingExtra="6sp" />
 
             <TextView
                 android:id="@+id/learn_more"
@@ -81,11 +79,9 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:fontFamily="sans-serif-medium"
-                android:padding="16dp"
                 android:text="@string/learn_more"
-                android:textAllCaps="true"
-                android:textColor="#03a9f4"
-                android:textSize="14sp" />
+                android:textColor="@color/google_blue_300"
+                android:lineSpacingExtra="6sp" />
 
         </LinearLayout>