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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 2 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 unified diff | 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 3
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <org.chromium.chrome.browser.firstrun.TosAndUmaView 7 <org.chromium.chrome.browser.firstrun.DataReductionProxyView
8 xmlns:android="http://schemas.android.com/apk/res/android" 8 xmlns:android="http://schemas.android.com/apk/res/android"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" > 10 android:layout_height="match_parent" >
11 11
12 <ScrollView 12 <ScrollView
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 android:layout_height="match_parent" 14 android:layout_height="match_parent"
15 android:layout_marginBottom="57dp" 15 android:layout_marginBottom="57dp"
16 android:fillViewport="true" 16 android:fillViewport="true"
17 android:scrollbarStyle="outsideOverlay" > 17 android:scrollbarStyle="outsideOverlay" >
18 18
19 <LinearLayout 19 <LinearLayout
20 android:layout_width="match_parent" 20 android:layout_width="match_parent"
21 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
22 android:gravity="center" 22 android:gravity="center"
23 android:orientation="vertical" > 23 android:orientation="vertical" >
24 24
25 <TextView 25 <TextView
26 android:id="@+id/data_reduction_title_1"
26 android:layout_width="wrap_content" 27 android:layout_width="wrap_content"
27 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
28 android:layout_marginTop="@dimen/fre_margin" 29 android:layout_marginTop="@dimen/fre_margin"
29 android:gravity="center" 30 android:gravity="center"
30 android:lineSpacingMultiplier="1.4" 31 android:lineSpacingMultiplier="1.4"
31 android:text="@string/fre_welcome" 32 android:text="@string/data_reduction_title"
32 android:textColor="@color/fre_title_color" 33 android:textColor="@color/fre_title_color"
33 android:textSize="@dimen/fre_title_text_size" /> 34 android:textSize="@dimen/fre_title_text_size" />
34 35
35 <LinearLayout 36 <LinearLayout
36 android:id="@+id/fre_content" 37 android:id="@+id/fre_content"
37 android:layout_width="match_parent" 38 android:layout_width="match_parent"
38 android:layout_height="wrap_content" 39 android:layout_height="wrap_content"
39 android:layout_marginTop="@dimen/fre_margin" 40 android:layout_marginTop="@dimen/fre_margin"
40 android:gravity="center_horizontal"> 41 android:gravity="center_horizontal" >
41 42
42 <ImageView 43 <ImageView
44 android:id="@+id/data_reduction_illustration"
43 android:layout_width="wrap_content" 45 android:layout_width="wrap_content"
44 android:layout_height="@dimen/fre_image_carousel_height" 46 android:layout_height="@dimen/fre_image_carousel_height"
45 android:layout_marginBottom="@dimen/fre_margin" 47 android:layout_marginBottom="@dimen/fre_margin"
46 android:contentDescription="@null" 48 android:contentDescription="@null"
47 android:src="@drawable/fre_product_logo" /> 49 android:src="@drawable/data_reduction_illustration"
50 android:paddingEnd="@dimen/fre_margin"
51 android:paddingStart="@dimen/fre_margin" />
52
53 <TextView
54 android:id="@+id/data_reduction_title_2"
55 android:layout_width="wrap_content"
56 android:layout_height="wrap_content"
57 android:layout_marginBottom="@dimen/fre_margin"
58 android:gravity="center"
59 android:lineSpacingMultiplier="1.4"
60 android:text="@string/data_reduction_promo_title"
61 android:textColor="@color/fre_title_color"
62 android:textSize="@dimen/fre_title_text_size" />
48 63
49 <LinearLayout 64 <LinearLayout
50 android:id="@+id/text_wrapper" 65 android:id="@+id/data_reduction_invitation_text"
51 android:layout_width="0dp" 66 android:layout_width="0dp"
52 android:layout_height="0dp" 67 android:layout_height="0dp"
68 android:layout_marginBottom="@dimen/fre_margin"
53 android:layout_weight="1" 69 android:layout_weight="1"
54 android:layout_marginBottom="@dimen/fre_margin"
55 android:orientation="vertical" 70 android:orientation="vertical"
56 android:paddingEnd="@dimen/fre_margin" 71 android:paddingEnd="@dimen/fre_margin"
57 android:paddingStart="@dimen/fre_margin" > 72 android:paddingStart="@dimen/fre_margin" >
58 73
59 <org.chromium.ui.widget.TextViewWithClickableSpans 74 <TextView
60 android:id="@+id/tos_and_privacy"
61 android:layout_width="wrap_content" 75 android:layout_width="wrap_content"
62 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
63 android:layout_marginBottom="@dimen/fre_margin" 77 android:layout_marginBottom="@dimen/fre_margin"
64 android:gravity="center" 78 android:gravity="start"
65 android:lineSpacingMultiplier="1.4" 79 android:lineSpacingMultiplier="1.4"
66 android:textColor="@color/fre_text_color" 80 android:textColor="@color/fre_text_color"
67 android:textSize="@dimen/fre_normal_text_size" /> 81 android:textSize="@dimen/fre_normal_text_size"
82 android:text="@string/data_reduction_promo_summary" />
68 83
69 <CheckBox 84 <Switch
70 android:id="@+id/send_report_checkbox" 85 android:id="@+id/enable_data_saver_switch"
71 android:layout_width="wrap_content" 86 android:layout_width="match_parent"
72 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
88 android:gravity="start"
73 android:lineSpacingMultiplier="1.4" 89 android:lineSpacingMultiplier="1.4"
74 android:text="@string/fre_send_report_check" 90 android:text="@string/data_reduction_enable_switch"
75 android:textColor="@color/fre_text_color" 91 android:textColor="@color/fre_text_color"
76 android:textSize="@dimen/fre_normal_text_size" /> 92 android:textSize="@dimen/fre_normal_text_size"
93 android:textStyle="bold" />
77 </LinearLayout> 94 </LinearLayout>
78 </LinearLayout> 95 </LinearLayout>
79 </LinearLayout> 96 </LinearLayout>
80 </ScrollView> 97 </ScrollView>
81 98
82 <View 99 <View
83 style="@style/ButtonBarTopDivider" 100 style="@style/ButtonBarTopDivider"
84 android:layout_gravity="bottom" 101 android:layout_gravity="bottom"
85 android:layout_marginBottom="56dp" /> 102 android:layout_marginBottom="56dp" />
86 103
87 <Button 104 <Button
88 android:id="@+id/terms_accept" 105 android:id="@+id/next_button"
89 android:layout_width="match_parent" 106 android:layout_width="wrap_content"
90 android:layout_height="56dp" 107 android:layout_height="56dp"
91 android:layout_gravity="bottom" 108 android:layout_gravity="bottom|end"
92 android:background="?attr/listChoiceBackgroundIndicator" 109 android:background="?attr/listChoiceBackgroundIndicator"
110 android:gravity="end|center_vertical"
111 android:paddingStart="@dimen/fre_button_padding"
112 android:paddingEnd="@dimen/fre_button_padding"
93 android:padding="16dp" 113 android:padding="16dp"
94 android:text="@string/fre_accept_continue" 114 android:text="@string/fre_next"
95 android:textAllCaps="true" 115 android:textAllCaps="true"
96 android:textColor="@color/light_active_color" 116 android:textColor="@color/light_active_color"
97 android:textSize="@dimen/fre_button_text_size" /> 117 android:textSize="@dimen/fre_button_text_size" />
98 118
99 </org.chromium.chrome.browser.firstrun.TosAndUmaView> 119 </org.chromium.chrome.browser.firstrun.DataReductionProxyView>
OLDNEW
« 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