Create a new Data Saver settings page that adds the site breakdown

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

Index: chrome/android/java/res/layout/data_reduction_stats_layout.xml
diff --git a/chrome/android/java/res/layout/data_reduction_stats_layout.xml b/chrome/android/java/res/layout/data_reduction_stats_layout.xml
index 86092ed9b2d09471fdcba422a60edca6d55823fd..84847349124961b7d3c34c470a64e1dcc0959a87 100644
--- a/chrome/android/java/res/layout/data_reduction_stats_layout.xml
+++ b/chrome/android/java/res/layout/data_reduction_stats_layout.xml
@@ -12,108 +12,96 @@
     android:clipToPadding="false"
     android:orientation="vertical" >
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fadingEdge="horizontal"
-        android:text="@string/data_reduction_stats_title"
-        android:textAppearance="@style/PreferenceCategoryTextStyle" />
-
-    <include layout="@layout/data_usage_chart" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <TextView
-            android:id="@+id/data_reduction_start_date"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textAppearance="@style/PreferenceSummary"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/data_reduction_end_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/PreferenceSummary"
-            android:textSize="14sp" />
-
-    </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:baselineAligned="false"
         android:orientation="horizontal" >
 
-        <TextView
-            android:id="@+id/data_reduction_percent"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="0dp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="50sp" />
-
-        <FrameLayout
+        <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:paddingEnd="6dp"
-            android:paddingStart="20dp" >
+            android:orientation="vertical" >
 
             <LinearLayout
-                android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_gravity="end"
-                android:orientation="vertical"
-                tools:ignore="UselessParent" >
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:orientation="horizontal" >
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="14dp"
                     android:singleLine="true"
-                    android:text="@string/data_reduction_original_size_label"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="14sp" />
+                    android:text="@string/data_reduction_savings_label"
+                    android:textAppearance="@style/PreferenceCategoryTextStyle" />
+
+                <TextView
+                    android:id="@+id/data_reduction_savings"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="3dp"
+                    android:textAppearance="@style/PreferenceCategoryTextStyle" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal" >
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
                     android:singleLine="true"
-                    android:text="@string/data_reduction_compressed_size_label"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:text="@string/data_reduction_usage_label"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/data_reduction_usage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="3dp"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:textSize="14sp" />
             </LinearLayout>
 
-        </FrameLayout>
+        </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/data_reduction_percent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="10dp" >
+            android:layout_width="wrap_content"
+            android:layout_marginTop="0dp"
+            android:includeFontPadding="false"
+            android:textColor="@color/light_active_color"
+            android:textSize="50sp" />
 
-            <TextView
-                android:id="@+id/data_reduction_original_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="14sp"
-                android:textStyle="bold" />
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/data_reduction_compressed_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-        </LinearLayout>
+    <include layout="@layout/data_usage_chart" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/data_reduction_start_date"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="@style/PreferenceSummary"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/data_reduction_end_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/PreferenceSummary"
+            android:textSize="14sp" />
 
     </LinearLayout>
 
@@ -128,5 +116,7 @@
         android:text="@string/data_reduction_proxy_unreachable_warn"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="14sp" />
+        
+    <include layout="@layout/data_usage_breakdown" />
 
 </LinearLayout>