| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 <!-- Copyright (c) 2013 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 <GridLayout xmlns:android="http://schemas.android.com/apk/res/android" | 7 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 8 android:id="@+id/editing_layout_shipping" | 8 android:id="@+id/editing_layout_shipping" |
| 9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
| 10 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" |
| 11 android:columnCount="4"> | 11 android:orientation="vertical"> |
| 12 <EditText | 12 <EditText |
| 13 android:id="@+id/recipient_name" |
| 14 android:layout_width="match_parent" |
| 13 android:layout_height="@dimen/autofill_edit_height" | 15 android:layout_height="@dimen/autofill_edit_height" |
| 14 android:id="@+id/recipient_name" | |
| 15 android:layout_margin="@dimen/autofill_edit_margin" | 16 android:layout_margin="@dimen/autofill_edit_margin" |
| 16 android:textSize="@dimen/autofill_edit_text_size" | 17 android:textSize="@dimen/autofill_edit_text_size"/> |
| 17 android:layout_gravity="fill_horizontal" | |
| 18 android:layout_columnSpan="4"/> | |
| 19 <EditText | 18 <EditText |
| 19 android:id="@+id/shipping_street_address_1" |
| 20 android:layout_width="match_parent" |
| 20 android:layout_height="@dimen/autofill_edit_height" | 21 android:layout_height="@dimen/autofill_edit_height" |
| 21 android:id="@+id/shipping_street_address_1" | |
| 22 android:layout_margin="@dimen/autofill_edit_margin" | 22 android:layout_margin="@dimen/autofill_edit_margin" |
| 23 android:textSize="@dimen/autofill_edit_text_size" | 23 android:textSize="@dimen/autofill_edit_text_size"/> |
| 24 android:layout_gravity="fill_horizontal" | |
| 25 android:layout_columnSpan="4"/> | |
| 26 <EditText | 24 <EditText |
| 25 android:id="@+id/shipping_street_address_2" |
| 26 android:layout_width="match_parent" |
| 27 android:layout_height="@dimen/autofill_edit_height" | 27 android:layout_height="@dimen/autofill_edit_height" |
| 28 android:id="@+id/shipping_street_address_2" | |
| 29 android:layout_margin="@dimen/autofill_edit_margin" | 28 android:layout_margin="@dimen/autofill_edit_margin" |
| 30 android:textSize="@dimen/autofill_edit_text_size" | 29 android:textSize="@dimen/autofill_edit_text_size"/> |
| 31 android:layout_gravity="fill_horizontal" | |
| 32 android:layout_columnSpan="4"/> | |
| 33 <EditText | 30 <EditText |
| 31 android:id="@+id/shipping_city" |
| 32 android:layout_width="match_parent" |
| 34 android:layout_height="@dimen/autofill_edit_height" | 33 android:layout_height="@dimen/autofill_edit_height" |
| 35 android:id="@+id/shipping_city" | |
| 36 android:layout_margin="@dimen/autofill_edit_margin" | 34 android:layout_margin="@dimen/autofill_edit_margin" |
| 37 android:textSize="@dimen/autofill_edit_text_size" | 35 android:textSize="@dimen/autofill_edit_text_size"/> |
| 38 android:layout_gravity="fill_horizontal" | |
| 39 android:layout_columnSpan="4"/> | |
| 40 <EditText | 36 <EditText |
| 37 android:id="@+id/shipping_state" |
| 38 android:layout_width="match_parent" |
| 41 android:layout_height="@dimen/autofill_edit_height" | 39 android:layout_height="@dimen/autofill_edit_height" |
| 42 android:id="@+id/shipping_state" | |
| 43 android:layout_margin="@dimen/autofill_edit_margin" | 40 android:layout_margin="@dimen/autofill_edit_margin" |
| 44 android:textSize="@dimen/autofill_edit_text_size" | 41 android:textSize="@dimen/autofill_edit_text_size"/> |
| 45 android:layout_gravity="fill_horizontal" | |
| 46 android:layout_columnSpan="4"/> | |
| 47 <EditText | 42 <EditText |
| 43 android:id="@+id/shipping_zip_code" |
| 44 android:layout_width="match_parent" |
| 48 android:layout_height="@dimen/autofill_edit_height" | 45 android:layout_height="@dimen/autofill_edit_height" |
| 49 android:id="@+id/shipping_zip_code" | |
| 50 android:layout_margin="@dimen/autofill_edit_margin" | 46 android:layout_margin="@dimen/autofill_edit_margin" |
| 51 android:textSize="@dimen/autofill_edit_text_size" | 47 android:textSize="@dimen/autofill_edit_text_size"/> |
| 52 android:layout_gravity="fill_horizontal" | |
| 53 android:layout_columnSpan="4"/> | |
| 54 <Spinner | 48 <Spinner |
| 55 android:layout_margin="5dp" | |
| 56 android:id="@+id/shipping_country_spinner" | 49 android:id="@+id/shipping_country_spinner" |
| 57 android:layout_gravity="fill_horizontal" | 50 android:layout_width="match_parent" |
| 58 android:layout_columnSpan="4"/> | 51 android:layout_height="@dimen/autofill_edit_height" |
| 52 android:layout_margin="5dp"/> |
| 59 <EditText | 53 <EditText |
| 54 android:id="@+id/shipping_phone_number" |
| 55 android:layout_width="match_parent" |
| 60 android:layout_height="@dimen/autofill_edit_height" | 56 android:layout_height="@dimen/autofill_edit_height" |
| 61 android:id="@+id/shipping_phone_number" | |
| 62 android:layout_margin="@dimen/autofill_edit_margin" | 57 android:layout_margin="@dimen/autofill_edit_margin" |
| 63 android:textSize="@dimen/autofill_edit_text_size" | 58 android:textSize="@dimen/autofill_edit_text_size"/> |
| 64 android:layout_gravity="fill_horizontal" | 59 </LinearLayout> |
| 65 android:layout_columnSpan="4"/> | |
| 66 </GridLayout> | |
| OLD | NEW |