| 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" |
| 11 android:columnCount="4"> | 11 android:columnCount="4"> |
| 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_columnSpan="4" |
| 15 android:layout_gravity="fill_horizontal" | 15 android:layout_gravity="fill_horizontal" |
| 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:textSize="@dimen/autofill_notification_text_size" | 18 android:textSize="@dimen/autofill_notification_text_size" |
| 18 android:visibility="gone"/> | 19 android:visibility="gone"/> |
| 19 <LinearLayout | 20 <LinearLayout |
| 20 android:id="@+id/top_notifications" | 21 android:id="@+id/top_notifications" |
| 21 android:layout_columnSpan="4" | 22 android:layout_columnSpan="4" |
| 22 android:layout_gravity="fill_horizontal" | 23 android:layout_gravity="fill_horizontal" |
| 23 android:layout_marginLeft="@dimen/autofill_steady_margin" | 24 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 25 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 24 android:orientation="vertical" | 26 android:orientation="vertical" |
| 25 android:visibility="gone"/> | 27 android:visibility="gone"/> |
| 26 <TextView | 28 <TextView |
| 27 android:id="@+id/cc_billing_label" | 29 android:id="@+id/cc_billing_label" |
| 28 android:layout_columnSpan="2" | 30 android:layout_columnSpan="2" |
| 29 android:layout_marginLeft="@dimen/autofill_steady_margin" | 31 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 30 android:textSize="@dimen/autofill_steady_text_size" | 32 android:textSize="@dimen/autofill_steady_text_size" |
| 31 android:textStyle="bold"/> | 33 android:textStyle="bold"/> |
| 32 <Space | 34 <Space |
| 33 android:layout_columnSpan="2" | 35 android:layout_columnSpan="2" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 android:layout_columnSpan="4" | 104 android:layout_columnSpan="4" |
| 103 android:layout_gravity="fill_horizontal" | 105 android:layout_gravity="fill_horizontal" |
| 104 android:layout_margin="@dimen/autofill_steady_margin" | 106 android:layout_margin="@dimen/autofill_steady_margin" |
| 105 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" | 107 android:dropDownVerticalOffset="@dimen/autofill_spinner_offset" |
| 106 android:padding="@dimen/autofill_menu_item_padding"/> | 108 android:padding="@dimen/autofill_menu_item_padding"/> |
| 107 <CheckBox | 109 <CheckBox |
| 108 android:id="@+id/save_locally_checkbox" | 110 android:id="@+id/save_locally_checkbox" |
| 109 android:layout_columnSpan="4" | 111 android:layout_columnSpan="4" |
| 110 android:layout_gravity="fill_horizontal" | 112 android:layout_gravity="fill_horizontal" |
| 111 android:layout_marginLeft="@dimen/autofill_steady_margin" | 113 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 114 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 112 android:textSize="@dimen/autofill_notification_text_size" | 115 android:textSize="@dimen/autofill_notification_text_size" |
| 113 android:visibility="gone"/> | 116 android:visibility="gone"/> |
| 114 <LinearLayout | 117 <LinearLayout |
| 115 android:id="@+id/bottom_notifications" | 118 android:id="@+id/bottom_notifications" |
| 116 android:layout_columnSpan="4" | 119 android:layout_columnSpan="4" |
| 117 android:layout_gravity="fill_horizontal" | 120 android:layout_gravity="fill_horizontal" |
| 118 android:layout_marginLeft="@dimen/autofill_steady_margin" | 121 android:layout_marginLeft="@dimen/autofill_steady_margin" |
| 122 android:layout_marginRight="@dimen/autofill_steady_margin" |
| 119 android:orientation="vertical" | 123 android:orientation="vertical" |
| 120 android:visibility="gone"/> | 124 android:visibility="gone"/> |
| 121 <View | 125 <View |
| 122 android:id="@+id/line_bottom" | 126 android:id="@+id/line_bottom" |
| 123 android:layout_columnSpan="4" | 127 android:layout_columnSpan="4" |
| 124 android:layout_height="1dp" | 128 android:layout_height="1dp" |
| 125 android:background="#D9D9DC"/> | 129 android:background="#D9D9DC"/> |
| 126 <Button | 130 <Button |
| 127 android:id="@+id/terms_info" | 131 android:id="@+id/terms_info" |
| 128 android:layout_columnSpan="4" | 132 android:layout_columnSpan="4" |
| 129 android:background="?android:attr/selectableItemBackground" | 133 android:background="?android:attr/selectableItemBackground" |
| 130 android:drawableRight="@drawable/arrow" | |
| 131 android:gravity="left" | 134 android:gravity="left" |
| 132 android:padding="10dp" | 135 android:padding="10dp" |
| 133 android:text="@string/autofill_terms_of_service" | 136 android:text="@string/autofill_terms_of_service" |
| 134 android:textSize="@dimen/autofill_notification_text_size" | 137 android:textSize="@dimen/autofill_notification_text_size" |
| 135 android:visibility="gone"/> | 138 android:visibility="gone"/> |
| 136 </GridLayout> | 139 </GridLayout> |
| OLD | NEW |