| 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 <GridLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 8 android:id="@+id/general_layout" | 8 android:id="@+id/general_layout" |
| 9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
| 10 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 android:layout_columnSpan="4"/> | 76 android:layout_columnSpan="4"/> |
| 77 <TextView | 77 <TextView |
| 78 android:id="@+id/shipping_label" | 78 android:id="@+id/shipping_label" |
| 79 android:layout_marginLeft="@dimen/autofill_steady_margin" | 79 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 80 android:layout_columnSpan="2" | 80 android:layout_columnSpan="2" |
| 81 android:textStyle="bold" | 81 android:textStyle="bold" |
| 82 android:textSize="@dimen/autofill_steady_text_size"/> | 82 android:textSize="@dimen/autofill_steady_text_size"/> |
| 83 <Space | 83 <Space |
| 84 android:layout_gravity="fill" | 84 android:layout_gravity="fill" |
| 85 android:layout_columnSpan="2"/> | 85 android:layout_columnSpan="2"/> |
| 86 <CheckBox |
| 87 android:id="@+id/use_billing_checkbox" |
| 88 android:padding="@dimen/autofill_steady_margin" |
| 89 android:textSize="@dimen/autofill_notification_text_size" |
| 90 android:layout_gravity="fill_horizontal" |
| 91 android:layout_columnSpan="4"/> |
| 86 <Spinner | 92 <Spinner |
| 87 android:layout_margin="@dimen/autofill_steady_margin" | 93 android:layout_margin="@dimen/autofill_steady_margin" |
| 88 android:id="@+id/address_spinner" | 94 android:id="@+id/address_spinner" |
| 89 android:layout_gravity="fill_horizontal" | 95 android:layout_gravity="fill_horizontal" |
| 90 android:layout_columnSpan="4"/> | 96 android:layout_columnSpan="4"/> |
| 91 <LinearLayout | 97 <LinearLayout |
| 92 android:id="@+id/bottom_notifications" | 98 android:id="@+id/bottom_notifications" |
| 93 android:visibility="gone" | 99 android:visibility="gone" |
| 94 android:layout_gravity="fill_horizontal" | 100 android:layout_gravity="fill_horizontal" |
| 95 android:layout_columnSpan="4"/> | 101 android:layout_columnSpan="4"/> |
| 96 <View | 102 <View |
| 97 android:id="@+id/line_bottom" | 103 android:id="@+id/line_bottom" |
| 98 android:layout_height="1dp" | 104 android:layout_height="1dp" |
| 99 android:layout_columnSpan="4" | 105 android:layout_columnSpan="4" |
| 100 android:background="#D9D9DC"/> | 106 android:background="#D9D9DC"/> |
| 101 <Button | 107 <Button |
| 102 android:text="@string/autofill_terms_of_service" | 108 android:text="@string/autofill_terms_of_service" |
| 103 android:padding="10dp" | 109 android:padding="10dp" |
| 104 android:visibility="gone" | 110 android:visibility="gone" |
| 105 android:id="@+id/terms_info" | 111 android:id="@+id/terms_info" |
| 106 android:textSize="@dimen/autofill_notification_text_size" | 112 android:textSize="@dimen/autofill_notification_text_size" |
| 107 android:background="?android:attr/selectableItemBackground" | 113 android:background="?android:attr/selectableItemBackground" |
| 108 android:drawableRight="@drawable/arrow" | 114 android:drawableRight="@drawable/arrow" |
| 109 android:layout_columnSpan="4" | 115 android:layout_columnSpan="4" |
| 110 android:gravity="left"/> | 116 android:gravity="left"/> |
| 111 </GridLayout> | 117 </GridLayout> |
| OLD | NEW |