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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/android/java/res/layout/data_reduction_promo_screen.xml

Issue 1562733003: Make the Data Saver Promo buttons always visible at the bottom of the promo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: close button fix Created 4 years, 11 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/FirstRunFlowSequencer.java » ('j') | no next file with comments »
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 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView 6 <org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" 8 xmlns:chrome="http://schemas.android.com/apk/res-auto"
9 android:background="#c000" > 9 android:background="#c000" >
10 10
11 <ScrollView 11 <RelativeLayout
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 android:layout_gravity="center" 14 android:layout_gravity="center"
15 android:fillViewport="true"> 15 android:background="#FFFF" >
16 16
17 <RelativeLayout 17 <LinearLayout
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 android:layout_width="match_parent" 19 android:layout_width="match_parent"
20 android:background="#FFFF" > 20 android:layout_alignParentTop="true"
21 android:orientation="vertical" >
21 22
22 <org.chromium.chrome.browser.widget.TintedImageButton 23 <ScrollView
23 android:id="@+id/close_button" 24 android:id="@+id/data_reduction_promo_scroll"
24 android:layout_height="56dp" 25 android:layout_height="0dp"
25 android:layout_width="56dp" 26 android:layout_width="match_parent"
26 android:layout_alignParentEnd="true"
27 android:layout_alignParentTop="true" 27 android:layout_alignParentTop="true"
newt (away) 2016/01/07 20:49:07 whoops. remove this.
megjablon 2016/01/07 21:35:11 Done.
28 android:background="?android:attr/selectableItemBackground" 28 android:layout_weight="1"
29 android:contentDescription="@string/close" 29 android:fillViewport="true"
30 android:src="@drawable/btn_close" /> 30 android:requiresFadingEdge="vertical"
31 android:fadingEdgeLength="20dp" >
32
33 <LinearLayout
34 android:id="@+id/data_reduction_promo_content"
35 android:layout_height="wrap_content"
36 android:layout_width="match_parent"
37 android:paddingEnd="24dp"
38 android:paddingStart="24dp"
39 android:paddingTop="64dp" >
40
41 <ImageView
42 android:id="@+id/data_reduction_illustration"
43 android:layout_height="wrap_content"
44 android:layout_width="wrap_content"
45 android:layout_gravity="center"
46 android:adjustViewBounds="true"
47 android:contentDescription="@null"
48 android:src="@drawable/data_reduction_illustration" />
49
50 <LinearLayout
51 android:id="@+id/text_wrapper"
52 android:layout_height="wrap_content"
53 android:layout_width="wrap_content"
54 android:orientation="vertical" >
55
56 <TextView
57 android:layout_height="wrap_content"
58 android:layout_width="match_parent"
59 android:layout_marginBottom="8dp"
60 android:text="@string/data_reduction_promo_title"
61 android:textColor="@color/default_text_color"
62 android:textSize="@dimen/data_reduction_promo_title_ text_size" />
63
64 <TextView
65 android:layout_height="wrap_content"
66 android:layout_width="match_parent"
67 android:layout_marginBottom="30dp"
68 android:lineSpacingMultiplier="1.3"
69 android:text="@string/data_reduction_promo_summary"
70 android:textColor="#646464"
71 android:textSize="@dimen/data_reduction_promo_normal _text_size" />
72 </LinearLayout>
73 </LinearLayout>
74 </ScrollView>
31 75
32 <LinearLayout 76 <LinearLayout
33 android:id="@+id/data_reduction_promo_content" 77 android:id="@+id/data_reduction_promo_buttons"
34 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
35 android:layout_width="match_parent" 79 android:layout_width="match_parent"
36 android:layout_below="@+id/close_button"
37 android:layout_marginTop="8dp"
38 android:paddingEnd="24dp"
39 android:paddingStart="24dp" >
40
41 <ImageView
42 android:id="@+id/data_reduction_illustration"
43 android:layout_height="wrap_content"
44 android:layout_width="wrap_content"
45 android:layout_gravity="center"
46 android:adjustViewBounds="true"
47 android:contentDescription="@null"
48 android:src="@drawable/data_reduction_illustration" />
49
50 <LinearLayout
51 android:id="@+id/text_wrapper"
52 android:layout_height="wrap_content"
53 android:layout_width="wrap_content"
54 android:orientation="vertical" >
55
56 <TextView
57 android:layout_height="wrap_content"
58 android:layout_width="match_parent"
59 android:layout_marginBottom="8dp"
60 android:text="@string/data_reduction_promo_title"
61 android:textColor="@color/default_text_color"
62 android:textSize="@dimen/data_reduction_promo_title_text _size" />
63
64 <TextView
65 android:layout_height="wrap_content"
66 android:layout_width="match_parent"
67 android:layout_marginBottom="30dp"
68 android:lineSpacingMultiplier="1.3"
69 android:text="@string/data_reduction_promo_summary"
70 android:textColor="#646464"
71 android:textSize="@dimen/data_reduction_promo_normal_tex t_size" />
72 </LinearLayout>
73 </LinearLayout>
74
75 <LinearLayout
76 android:layout_height="wrap_content"
77 android:layout_width="match_parent"
78 android:layout_below="@id/data_reduction_promo_content"
79 android:layout_gravity="bottom"
80 android:orientation="horizontal" 80 android:orientation="horizontal"
81 android:clipToPadding="false" 81 android:clipToPadding="false"
82 android:padding="16dp" 82 android:padding="16dp"
83 android:gravity="end" > 83 android:gravity="end" >
84 84
85 <Button 85 <Button
86 android:id="@+id/no_thanks_button" 86 android:id="@+id/no_thanks_button"
87 android:layout_height="match_parent" 87 android:layout_height="match_parent"
88 android:layout_width="wrap_content" 88 android:layout_width="wrap_content"
89 android:layout_marginEnd="8dp" 89 android:layout_marginEnd="8dp"
90 android:minHeight="40dp" 90 android:minHeight="40dp"
91 android:text="@string/no_thanks" 91 android:text="@string/no_thanks"
92 android:textColor="@color/light_normal_color" 92 android:textColor="@color/light_normal_color"
93 android:textSize="@dimen/data_reduction_promo_button_text_si ze" 93 android:textSize="@dimen/data_reduction_promo_button_text_si ze"
94 style="@style/ButtonCompatBorderless" /> 94 style="@style/ButtonCompatBorderless" />
95 95
96 <org.chromium.ui.widget.ButtonCompat 96 <org.chromium.ui.widget.ButtonCompat
97 android:id="@+id/enable_button" 97 android:id="@+id/enable_button"
98 android:layout_height="match_parent" 98 android:layout_height="match_parent"
99 android:layout_width="wrap_content" 99 android:layout_width="wrap_content"
100 android:elevation="0dp" 100 android:elevation="0dp"
101 android:minHeight="40dp" 101 android:minHeight="40dp"
102 android:text="@string/data_reduction_enable_button" 102 android:text="@string/data_reduction_enable_button"
103 android:textColor="#FFFFFF" 103 android:textColor="#FFFFFF"
104 android:textSize="@dimen/data_reduction_promo_button_text_si ze" 104 android:textSize="@dimen/data_reduction_promo_button_text_si ze"
105 chrome:buttonColor="@color/light_active_color" /> 105 chrome:buttonColor="@color/light_active_color" />
106 </LinearLayout> 106 </LinearLayout>
107 </RelativeLayout> 107 </LinearLayout>
108 </ScrollView> 108
109 <org.chromium.chrome.browser.widget.TintedImageButton
110 android:id="@+id/close_button"
111 android:layout_height="56dp"
112 android:layout_width="56dp"
113 android:layout_alignParentEnd="true"
114 android:layout_alignParentTop="true"
115 android:background="?android:attr/selectableItemBackground"
116 android:contentDescription="@string/close"
117 android:src="@drawable/btn_close" />
118
119 </RelativeLayout>
109 </org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView> 120 </org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698