Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java/res/layout/fre_data_reduction_proxy.xml

Issue 1339613004: Add Data Reduction Proxy card to Clank FRE in EM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/DataReductionProxyFirstRunFragment.java » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 62%
copy from chrome/android/java/res/layout/fre_tosanduma.xml
copy to chrome/android/java/res/layout/fre_data_reduction_proxy.xml
index 04700e9dfe20abcfe1aaa417e797e4c6652379ee..6fb1ac749557b218014d9047986568ed33b2d3d3 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" >
@@ -23,12 +23,13 @@
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" />
@@ -37,43 +38,59 @@
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"
+ 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_weight="1"
android:layout_marginBottom="@dimen/fre_margin"
+ android:layout_weight="1"
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:textColor="@color/fre_text_color"
- android:textSize="@dimen/fre_normal_text_size" />
+ android:textSize="@dimen/fre_normal_text_size"
+ android:text="@string/data_reduction_promo_summary" />
- <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>
@@ -85,15 +102,18 @@
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/fre_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>
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/DataReductionProxyFirstRunFragment.java » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('J')

Powered by Google App Engine
This is Rietveld 408576698