Add Data Reduction Proxy card to Clank FRE in EM

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

Index: chrome/android/java/res/layout/fre_data_reduction_proxy.xml
diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_data_reduction_proxy.xml
similarity index 71%
copy from chrome/android/java/res/layout/fre_tosanduma.xml
copy to chrome/android/java/res/layout/fre_data_reduction_proxy.xml
index 04700e9dfe20abcfe1aaa417e797e4c6652379ee..8a948d96255fee070a226be769270165eaf6eab4 100644
--- a/chrome/android/java/res/layout/fre_tosanduma.xml
+++ b/chrome/android/java/res/layout/fre_data_reduction_proxy.xml
@@ -4,7 +4,7 @@
      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" >
@@ -28,7 +28,7 @@
                 android:layout_marginTop="@dimen/fre_margin"
                 android:gravity="center"
                 android:lineSpacingMultiplier="1.4"
-                android:text="@string/fre_welcome"
+                android:text="@string/data_reduction_promo_title"
                 android:textColor="@color/fre_title_color"
                 android:textSize="@dimen/fre_title_text_size" />
 
@@ -37,43 +37,46 @@
                 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: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" />
 
                 <LinearLayout
-                    android:id="@+id/text_wrapper"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/fre_margin"
                     android:orientation="vertical"
-                    android:paddingEnd="@dimen/fre_margin"
-                    android:paddingStart="@dimen/fre_margin" >
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="24dp"
+                    android:paddingStart="24dp" >
 
-                    <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:showText="false"
+                        android:textOff="@string/data_reduction_disabled_switch"
+                        android:text="@string/data_reduction_enabled_switch"
                         android:textColor="@color/fre_text_color"
-                        android:textSize="@dimen/fre_normal_text_size" />
+                        android:textSize="@dimen/fre_normal_text_size"
+                        android:textStyle="bold" />

[newt (away), 2015/09/28 20:12:08]

Bold? not Roboto Medium (i.e. "android:fontFamily="sans-serif-medium")?

Roboto Medium is what we often use instead of bold.

[megjablon, 2015/09/28 23:37:28]

Done.

                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
@@ -85,15 +88,15 @@
         android:layout_marginBottom="56dp" />
 
     <Button
-        android:id="@+id/terms_accept"
+        android:id="@+id/next_button"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:layout_gravity="bottom"
         android:background="?attr/listChoiceBackgroundIndicator"
         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>