Add Data Reduction Proxy card to Clank FRE in EM

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

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2015 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.firstrun.TosAndUmaView
+<org.chromium.chrome.browser.firstrun.DataReductionProxyView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="57dp"
         android:fillViewport="true"
         android:scrollbarStyle="outsideOverlay" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="vertical" >
 
             <TextView
+                android:id="@+id/data_reduction_title_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/fre_margin"
                 android:gravity="center"
                 android:lineSpacingMultiplier="1.4"
-                android:text="@string/fre_welcome"
+                android:text="@string/data_reduction_title"
                 android:textColor="@color/fre_title_color"
                 android:textSize="@dimen/fre_title_text_size" />
 
             <LinearLayout
                 android:id="@+id/fre_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/fre_margin"
-                android:gravity="center_horizontal">
+                android:gravity="center_horizontal" >
 
                 <ImageView
+                    android:id="@+id/data_reduction_illustration"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/fre_image_carousel_height"
                     android:layout_marginBottom="@dimen/fre_margin"
                     android:contentDescription="@null"
-                    android:src="@drawable/fre_product_logo" />
+                    android:src="@drawable/data_reduction_illustration"
+                    android:paddingEnd="@dimen/fre_margin"
+                    android:paddingStart="@dimen/fre_margin" />
+
+                <TextView
+                    android:id="@+id/data_reduction_title_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/fre_margin"
+                    android:gravity="center"
+                    android:lineSpacingMultiplier="1.4"
+                    android:text="@string/data_reduction_promo_title"

[aurimas (slooooooooow), 2015/09/24 20:59:10]

Why do we use two different titles for landscape and portrait?

[megjablon, 2015/09/24 23:40:34]

Done.

+                    android:textColor="@color/fre_title_color"
+                    android:textSize="@dimen/fre_title_text_size" />
 
                 <LinearLayout
-                    android:id="@+id/text_wrapper"
+                    android:id="@+id/data_reduction_invitation_text"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
+                    android:layout_marginBottom="@dimen/fre_margin"
                     android:layout_weight="1"
-                    android:layout_marginBottom="@dimen/fre_margin"
                     android:orientation="vertical"
                     android:paddingEnd="@dimen/fre_margin"
                     android:paddingStart="@dimen/fre_margin" >
 
-                    <org.chromium.ui.widget.TextViewWithClickableSpans
-                        android:id="@+id/tos_and_privacy"
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="@dimen/fre_margin"
-                        android:gravity="center"
+                        android:gravity="start"
                         android:lineSpacingMultiplier="1.4"
+                        android:text="@string/data_reduction_promo_summary"
                         android:textColor="@color/fre_text_color"
                         android:textSize="@dimen/fre_normal_text_size" />
 
-                    <CheckBox
-                        android:id="@+id/send_report_checkbox"
-                        android:layout_width="wrap_content"
+                    <Switch
+                        android:id="@+id/enable_data_saver_switch"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="start"
                         android:lineSpacingMultiplier="1.4"
-                        android:text="@string/fre_send_report_check"
+                        android:text="@string/data_reduction_enable_switch"
                         android:textColor="@color/fre_text_color"
-                        android:textSize="@dimen/fre_normal_text_size" />
+                        android:textSize="@dimen/fre_normal_text_size"
+                        android:textStyle="bold" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
 
     <View
         style="@style/ButtonBarTopDivider"
         android:layout_gravity="bottom"
         android:layout_marginBottom="56dp" />
 
     <Button
-        android:id="@+id/terms_accept"
-        android:layout_width="match_parent"
+        android:id="@+id/next_button"
+        android:layout_width="wrap_content"
         android:layout_height="56dp"
-        android:layout_gravity="bottom"
+        android:layout_gravity="bottom|end"
         android:background="?attr/listChoiceBackgroundIndicator"
+        android:gravity="end|center_vertical"
+        android:paddingStart="@dimen/fre_button_padding"
+        android:paddingEnd="@dimen/fre_button_padding"
         android:padding="16dp"
-        android:text="@string/fre_accept_continue"
+        android:text="@string/next"
         android:textAllCaps="true"
         android:textColor="@color/light_active_color"
         android:textSize="@dimen/fre_button_text_size" />
 
-</org.chromium.chrome.browser.firstrun.TosAndUmaView>
+</org.chromium.chrome.browser.firstrun.DataReductionProxyView>