OLD | NEW |
---|---|
(Empty) | |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | |
2 // Use of this source code is governed by a BSD-style license that can be | |
3 // found in the LICENSE file. | |
4 <?xml version="1.0" encoding="utf-8"?> | |
5 <org.chromium.chrome.browser.autofill.AutofillDialogContentView xmlns:android="h ttp://schemas.android.com/apk/res/android" | |
6 android:layout_width="match_parent" | |
7 android:layout_height="wrap_content"> | |
8 <GridLayout | |
9 android:id="@+id/general_layout" | |
10 android:layout_width="match_parent" | |
11 android:layout_height="wrap_content" | |
12 android:columnCount="4"> | |
13 <TextView | |
Ted C
2013/03/06 01:41:56
All of the children of this gridlayout should be i
Yusuf
2013/03/06 19:50:00
Done.
| |
14 android:text="@string/autofill_billing_title" | |
15 android:id="@+id/billing_title" | |
16 android:layout_marginLeft="5dp" | |
17 android:layout_columnSpan="2" | |
18 android:textSize="14sp"/> | |
19 <Space | |
20 android:layout_gravity="fill" | |
21 android:layout_columnSpan="2"/> | |
22 <Spinner | |
23 android:layout_margin="5dp" | |
24 android:id="@+id/cc_spinner" | |
25 android:layout_gravity="fill_horizontal" | |
26 android:layout_columnSpan="4"/> | |
27 <TextView | |
28 android:text="@string/autofill_shipping_title" | |
29 android:id="@+id/shipping_title" | |
30 android:layout_marginLeft="5dp" | |
31 android:layout_columnSpan="2" | |
32 android:textSize="14sp"/> | |
33 <Space | |
34 android:layout_gravity="fill" | |
35 android:layout_columnSpan="2"/> | |
36 <Spinner | |
37 android:layout_margin="5dp" | |
38 android:id="@+id/address_spinner" | |
39 android:layout_gravity="fill_horizontal" | |
40 android:layout_columnSpan="4"/> | |
41 <CheckBox | |
42 android:id="@+id/check_box" | |
43 android:layout_margin="5dp" | |
44 android:textSize="12sp" | |
45 android:text="@string/autofill_use_wallet" | |
46 android:layout_columnSpan="4"/> | |
47 <View | |
48 android:id="@+id/line_bottom" | |
49 android:layout_height="1dp" | |
50 android:layout_columnSpan="4" | |
51 android:background="#D9D9DC"/> | |
52 <Button | |
53 android:text="By clicking the below button, you agree to the terms of se rvice. And also some other text that makes sure this is not one line" | |
Ted C
2013/03/06 01:41:56
add this to strings.xml
| |
54 android:padding="10dp" | |
55 android:id="@+id/terms_info" | |
56 android:textSize="11sp" | |
57 android:background="?android:attr/selectableItemBackground" | |
58 android:drawableRight="@drawable/arrow" | |
59 android:layout_columnSpan="4" | |
60 android:gravity="left"/> | |
61 </GridLayout> | |
62 <GridLayout | |
63 android:id="@+id/editing_layout_billing" | |
64 android:layout_width="match_parent" | |
65 android:layout_height="wrap_content" | |
66 android:columnCount="4"> | |
67 <EditText | |
68 android:layout_height="48dp" | |
69 android:id="@+id/card_number" | |
70 android:layout_margin="2dp" | |
71 android:textSize="18sp" | |
72 android:hint="Card Number" | |
73 android:layout_gravity="fill_horizontal" | |
74 android:layout_columnSpan="4"/> | |
Ted C
2013/03/06 01:41:56
You'll also want to see how this behaves in access
Yusuf
2013/03/06 19:50:00
Adding this as a TODO.
On 2013/03/06 01:41:56, Te
| |
75 <EditText | |
76 android:layout_height="48dp" | |
77 android:id="@+id/expiration_month" | |
78 android:layout_margin="2dp" | |
79 android:textSize="18sp" | |
80 android:hint="MM"/> | |
Ted C
2013/03/06 01:41:56
these should probably be in strings.xml as well
a
Yusuf
2013/03/06 19:50:00
They are going to come from native. Removing them,
| |
81 <EditText | |
82 android:layout_height="48dp" | |
83 android:id="@+id/expiration_year" | |
84 android:layout_margin="2dp" | |
85 android:textSize="18sp" | |
86 android:hint="YY"/> | |
87 <Space | |
88 android:layout_columnSpan="1" | |
89 android:layout_gravity="fill"/> | |
90 <EditText | |
91 android:layout_height="48dp" | |
92 android:id="@+id/cvc_code" | |
93 android:layout_margin="2dp" | |
94 android:textSize="18sp" | |
95 android:hint="CVC" | |
96 android:layout_gravity="right"/> | |
97 <EditText | |
98 android:layout_height="48dp" | |
99 android:id="@+id/cardholder_name" | |
100 android:layout_margin="2dp" | |
101 android:textSize="18sp" | |
102 android:hint="Cardholder Name" | |
103 android:layout_gravity="fill_horizontal" | |
104 android:layout_columnSpan="4"/> | |
105 <EditText | |
106 android:layout_height="48dp" | |
107 android:id="@+id/billing_street_address_1" | |
108 android:layout_margin="2dp" | |
109 android:textSize="18sp" | |
110 android:hint="Street address" | |
111 android:layout_gravity="fill_horizontal" | |
112 android:layout_columnSpan="4"/> | |
113 <EditText | |
114 android:layout_height="48dp" | |
115 android:id="@+id/billing_street_address_2" | |
116 android:layout_margin="2dp" | |
117 android:textSize="18sp" | |
118 android:hint="Street address" | |
119 android:layout_gravity="fill_horizontal" | |
120 android:layout_columnSpan="4"/> | |
121 <EditText | |
122 android:layout_height="48dp" | |
123 android:id="@+id/billing_city" | |
124 android:layout_margin="2dp" | |
125 android:textSize="18sp" | |
126 android:hint="City" | |
127 android:layout_gravity="fill_horizontal" | |
128 android:layout_columnSpan="4"/> | |
129 <EditText | |
130 android:layout_height="48dp" | |
131 android:id="@+id/billing_zip_code" | |
132 android:layout_margin="2dp" | |
133 android:textSize="18sp" | |
134 android:hint="ZIP Code" | |
135 android:layout_gravity="fill_horizontal" | |
136 android:layout_columnSpan="4"/> | |
137 <EditText | |
138 android:layout_height="48dp" | |
139 android:id="@+id/billing_phone_number" | |
140 android:layout_margin="2dp" | |
141 android:textSize="18sp" | |
142 android:hint="Phone number" | |
143 android:layout_gravity="fill_horizontal" | |
144 android:layout_columnSpan="4"/> | |
145 </GridLayout> | |
146 <GridLayout | |
Ted C
2013/03/06 01:41:56
I would pull these three grid layouts into separat
Yusuf
2013/03/06 19:50:00
Done.
| |
147 android:id="@+id/editing_layout_shipping" | |
148 android:layout_width="match_parent" | |
149 android:layout_height="wrap_content" | |
150 android:columnCount="4"> | |
151 <EditText | |
152 android:layout_height="48dp" | |
153 android:id="@+id/recipient_name" | |
154 android:layout_margin="2dp" | |
155 android:textSize="18sp" | |
156 android:hint="Recipient name" | |
157 android:layout_gravity="fill_horizontal" | |
158 android:layout_columnSpan="4"/> | |
159 <EditText | |
160 android:layout_height="48dp" | |
161 android:id="@+id/street_address_1" | |
162 android:layout_margin="2dp" | |
163 android:textSize="18sp" | |
164 android:hint="Street address" | |
165 android:layout_gravity="fill_horizontal" | |
166 android:layout_columnSpan="4"/> | |
167 <EditText | |
168 android:layout_height="48dp" | |
169 android:id="@+id/street_address_2" | |
170 android:layout_margin="2dp" | |
171 android:textSize="18sp" | |
172 android:hint="Street address" | |
173 android:layout_gravity="fill_horizontal" | |
174 android:layout_columnSpan="4"/> | |
175 <EditText | |
176 android:layout_height="48dp" | |
177 android:id="@+id/city" | |
178 android:layout_margin="2dp" | |
179 android:textSize="18sp" | |
180 android:hint="City" | |
181 android:layout_gravity="fill_horizontal" | |
182 android:layout_columnSpan="4"/> | |
183 <EditText | |
184 android:layout_height="48dp" | |
185 android:id="@+id/zip_code" | |
186 android:layout_margin="2dp" | |
187 android:textSize="18sp" | |
188 android:hint="ZIP Code" | |
189 android:layout_gravity="fill_horizontal" | |
190 android:layout_columnSpan="4"/> | |
191 </GridLayout> | |
Ted C
2013/03/06 01:41:56
indent messed up.
Yusuf
2013/03/06 19:50:00
Done.
Yusuf
2013/03/06 19:50:00
Done.
| |
192 </org.chromium.chrome.browser.autofill.AutofillDialogContentView> | |
OLD | NEW |