| 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/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" |
| 11 android:columnCount="4"> | 11 android:orientation="vertical"> |
| 12 <CheckBox | 12 <CheckBox |
| 13 android:id="@+id/top_checkbox_notification" | 13 android:id="@+id/top_checkbox_notification" |
| 14 android:layout_columnSpan="4" | 14 android:layout_width="match_parent" |
| 15 android:layout_gravity="fill_horizontal" | 15 android:layout_height="@dimen/autofill_edit_height" |
| 16 android:layout_marginLeft="@dimen/autofill_steady_margin" | 16 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 17 android:layout_marginRight="@dimen/autofill_steady_margin" | 17 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 18 android:textSize="@dimen/autofill_notification_text_size" | 18 android:textSize="@dimen/autofill_notification_text_size" |
| 19 android:visibility="gone"/> | 19 android:visibility="gone"/> |
| 20 <LinearLayout | 20 <LinearLayout |
| 21 android:id="@+id/top_notifications" | 21 android:id="@+id/top_notifications" |
| 22 android:layout_columnSpan="4" | 22 android:layout_width="match_parent" |
| 23 android:layout_gravity="fill_horizontal" | 23 android:layout_height="wrap_content" |
| 24 android:layout_marginLeft="@dimen/autofill_steady_margin" | 24 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 25 android:layout_marginRight="@dimen/autofill_steady_margin" | 25 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 26 android:orientation="vertical" | 26 android:orientation="vertical" |
| 27 android:visibility="gone"/> | 27 android:visibility="gone"/> |
| 28 <TextView | 28 <TextView |
| 29 android:id="@+id/cc_billing_label" | 29 android:id="@+id/cc_billing_label" |
| 30 android:layout_columnSpan="2" | 30 android:layout_width="match_parent" |
| 31 android:layout_height="wrap_content" |
| 31 android:layout_marginLeft="@dimen/autofill_steady_margin" | 32 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 32 android:textSize="@dimen/autofill_steady_text_size" | 33 android:textSize="@dimen/autofill_steady_text_size" |
| 33 android:textStyle="bold"/> | 34 android:textStyle="bold"/> |
| 34 <Space | |
| 35 android:layout_columnSpan="2" | |
| 36 android:layout_gravity="fill"/> | |
| 37 <Spinner | 35 <Spinner |
| 38 android:id="@+id/cc_billing_spinner" | 36 android:id="@+id/cc_billing_spinner" |
| 39 android:layout_columnSpan="4" | 37 android:layout_width="match_parent" |
| 40 android:layout_gravity="fill_horizontal" | 38 android:layout_height="@dimen/autofill_edit_height" |
| 41 android:layout_margin="@dimen/autofill_steady_margin" | 39 android:layout_margin="@dimen/autofill_steady_margin" |
| 42 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" | 40 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" |
| 43 android:padding="@dimen/autofill_menu_item_padding"/> | 41 android:padding="@dimen/autofill_menu_item_padding"/> |
| 44 <TextView | 42 <TextView |
| 45 android:id="@+id/cc_label" | 43 android:id="@+id/cc_label" |
| 46 android:layout_columnSpan="2" | 44 android:layout_width="match_parent" |
| 45 android:layout_height="wrap_content" |
| 47 android:layout_marginLeft="@dimen/autofill_steady_margin" | 46 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 48 android:textSize="@dimen/autofill_steady_text_size" | 47 android:textSize="@dimen/autofill_steady_text_size" |
| 49 android:textStyle="bold"/> | 48 android:textStyle="bold"/> |
| 50 <Space | |
| 51 android:layout_columnSpan="2" | |
| 52 android:layout_gravity="fill"/> | |
| 53 <Spinner | 49 <Spinner |
| 54 android:id="@+id/cc_spinner" | 50 android:id="@+id/cc_spinner" |
| 55 android:layout_columnSpan="4" | 51 android:layout_width="match_parent" |
| 56 android:layout_gravity="fill_horizontal" | 52 android:layout_height="@dimen/autofill_edit_height" |
| 57 android:layout_margin="@dimen/autofill_steady_margin" | 53 android:layout_margin="@dimen/autofill_steady_margin" |
| 58 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" | 54 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" |
| 59 android:padding="@dimen/autofill_menu_item_padding"/> | 55 android:padding="@dimen/autofill_menu_item_padding"/> |
| 60 <TextView | 56 <TextView |
| 61 android:id="@+id/billing_label" | 57 android:id="@+id/billing_label" |
| 62 android:layout_columnSpan="2" | 58 android:layout_width="match_parent" |
| 59 android:layout_height="wrap_content" |
| 63 android:layout_marginLeft="@dimen/autofill_steady_margin" | 60 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 64 android:textSize="@dimen/autofill_steady_text_size" | 61 android:textSize="@dimen/autofill_steady_text_size" |
| 65 android:textStyle="bold"/> | 62 android:textStyle="bold"/> |
| 66 <Space | |
| 67 android:layout_columnSpan="2" | |
| 68 android:layout_gravity="fill"/> | |
| 69 <Spinner | 63 <Spinner |
| 70 android:id="@+id/billing_spinner" | 64 android:id="@+id/billing_spinner" |
| 71 android:layout_columnSpan="4" | 65 android:layout_width="match_parent" |
| 72 android:layout_gravity="fill_horizontal" | 66 android:layout_height="@dimen/autofill_edit_height" |
| 73 android:layout_margin="@dimen/autofill_steady_margin" | 67 android:layout_margin="@dimen/autofill_steady_margin" |
| 74 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" | 68 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" |
| 75 android:padding="@dimen/autofill_menu_item_padding" | 69 android:padding="@dimen/autofill_menu_item_padding" |
| 76 android:visibility="gone"/> | 70 android:visibility="gone"/> |
| 77 <TextView | 71 <TextView |
| 78 android:id="@+id/shipping_label" | 72 android:id="@+id/shipping_label" |
| 79 android:layout_columnSpan="2" | 73 android:layout_width="match_parent" |
| 74 android:layout_height="wrap_content" |
| 80 android:layout_marginLeft="@dimen/autofill_steady_margin" | 75 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 81 android:textSize="@dimen/autofill_steady_text_size" | 76 android:textSize="@dimen/autofill_steady_text_size" |
| 82 android:textStyle="bold"/> | 77 android:textStyle="bold"/> |
| 83 <Space | |
| 84 android:layout_columnSpan="2" | |
| 85 android:layout_gravity="fill"/> | |
| 86 <Spinner | 78 <Spinner |
| 87 android:id="@+id/address_spinner" | 79 android:id="@+id/address_spinner" |
| 88 android:layout_columnSpan="4" | 80 android:layout_width="match_parent" |
| 89 android:layout_gravity="fill_horizontal" | 81 android:layout_height="@dimen/autofill_edit_height" |
| 90 android:layout_margin="@dimen/autofill_steady_margin" | 82 android:layout_margin="@dimen/autofill_steady_margin" |
| 91 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" | 83 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" |
| 92 android:padding="@dimen/autofill_menu_item_padding"/> | 84 android:padding="@dimen/autofill_menu_item_padding"/> |
| 93 <TextView | 85 <TextView |
| 94 android:id="@+id/email_label" | 86 android:id="@+id/email_label" |
| 95 android:layout_columnSpan="2" | 87 android:layout_width="match_parent" |
| 88 android:layout_height="wrap_content" |
| 96 android:layout_marginLeft="@dimen/autofill_steady_margin" | 89 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 97 android:textSize="@dimen/autofill_steady_text_size" | 90 android:textSize="@dimen/autofill_steady_text_size" |
| 98 android:textStyle="bold"/> | 91 android:textStyle="bold"/> |
| 99 <Space | |
| 100 android:layout_columnSpan="2" | |
| 101 android:layout_gravity="fill"/> | |
| 102 <Spinner | 92 <Spinner |
| 103 android:id="@+id/email_spinner" | 93 android:id="@+id/email_spinner" |
| 104 android:layout_columnSpan="4" | 94 android:layout_width="match_parent" |
| 105 android:layout_gravity="fill_horizontal" | 95 android:layout_height="@dimen/autofill_edit_height" |
| 106 android:layout_margin="@dimen/autofill_steady_margin" | 96 android:layout_margin="@dimen/autofill_steady_margin" |
| 107 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" | 97 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" |
| 108 android:padding="@dimen/autofill_menu_item_padding"/> | 98 android:padding="@dimen/autofill_menu_item_padding"/> |
| 109 <CheckBox | 99 <CheckBox |
| 110 android:id="@+id/save_locally_checkbox" | 100 android:id="@+id/save_locally_checkbox" |
| 111 android:layout_columnSpan="4" | 101 android:layout_width="match_parent" |
| 112 android:layout_gravity="fill_horizontal" | 102 android:layout_height="@dimen/autofill_edit_height" |
| 113 android:layout_marginLeft="@dimen/autofill_steady_margin" | 103 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 114 android:layout_marginRight="@dimen/autofill_steady_margin" | 104 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 115 android:textSize="@dimen/autofill_notification_text_size" | 105 android:textSize="@dimen/autofill_notification_text_size" |
| 116 android:visibility="gone"/> | 106 android:visibility="gone"/> |
| 117 <LinearLayout | 107 <LinearLayout |
| 118 android:id="@+id/bottom_notifications" | 108 android:id="@+id/bottom_notifications" |
| 119 android:layout_columnSpan="4" | 109 android:layout_width="match_parent" |
| 120 android:layout_gravity="fill_horizontal" | 110 android:layout_height="wrap_content" |
| 121 android:layout_marginLeft="@dimen/autofill_steady_margin" | 111 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 122 android:layout_marginRight="@dimen/autofill_steady_margin" | 112 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 123 android:orientation="vertical" | 113 android:orientation="vertical" |
| 124 android:visibility="gone"/> | 114 android:visibility="gone"/> |
| 125 <View | 115 <View |
| 126 android:id="@+id/line_bottom" | 116 android:id="@+id/line_bottom" |
| 127 android:layout_columnSpan="4" | 117 android:layout_width="match_parent" |
| 128 android:layout_height="1dp" | 118 android:layout_height="1dp" |
| 129 android:background="#D9D9DC"/> | 119 android:background="#D9D9DC"/> |
| 130 <Button | 120 <Button |
| 131 android:id="@+id/terms_info" | 121 android:id="@+id/terms_info" |
| 132 android:layout_columnSpan="4" | 122 android:layout_width="match_parent" |
| 123 android:layout_height="wrap_content" |
| 133 android:background="?android:attr/selectableItemBackground" | 124 android:background="?android:attr/selectableItemBackground" |
| 134 android:gravity="left" | 125 android:gravity="left" |
| 135 android:padding="10dp" | 126 android:padding="10dp" |
| 136 android:text="@string/autofill_terms_of_service" | 127 android:text="@string/autofill_terms_of_service" |
| 137 android:textSize="@dimen/autofill_notification_text_size" | 128 android:textSize="@dimen/autofill_notification_text_size" |
| 138 android:visibility="gone"/> | 129 android:visibility="gone"/> |
| 139 </GridLayout> | 130 </LinearLayout> |
| OLD | NEW |