OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. |
3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
5 | 5 |
6 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 6 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
7 android:layout_width="match_parent" | 7 android:layout_width="match_parent" |
8 android:layout_height="wrap_content" | 8 android:layout_height="wrap_content" |
9 android:orientation="vertical" | 9 android:orientation="vertical" |
10 android:layout_marginBottom="8dp" > | 10 android:layout_marginBottom="8dp" > |
11 | 11 |
12 <LinearLayout | 12 <LinearLayout |
| 13 android:id="@+id/privacy_disclaimers" |
13 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
14 android:layout_height="wrap_content" | 15 android:layout_height="wrap_content" |
15 android:orientation="vertical" | 16 android:orientation="vertical" |
16 android:layout_marginTop="8dp" > | 17 android:layout_marginTop="8dp" |
| 18 android:layout_marginBottom="12dp" > |
17 | 19 |
18 <org.chromium.ui.widget.TextViewWithClickableSpans | 20 <org.chromium.ui.widget.TextViewWithClickableSpans |
19 android:id="@+id/signed_in_not_synced" | 21 android:id="@+id/signed_in_not_synced" |
20 style="@style/PrivacyDisclaimerText" /> | 22 style="@style/PrivacyDisclaimerText" /> |
21 | 23 |
22 <org.chromium.ui.widget.TextViewWithClickableSpans | 24 <org.chromium.ui.widget.TextViewWithClickableSpans |
23 android:id="@+id/signed_in_synced" | 25 android:id="@+id/signed_in_synced" |
24 style="@style/PrivacyDisclaimerText" /> | 26 style="@style/PrivacyDisclaimerText" /> |
25 | 27 |
26 <org.chromium.ui.widget.TextViewWithClickableSpans | 28 <org.chromium.ui.widget.TextViewWithClickableSpans |
27 android:id="@+id/other_forms_of_browsing_history" | 29 android:id="@+id/other_forms_of_browsing_history" |
28 style="@style/PrivacyDisclaimerText" /> | 30 style="@style/PrivacyDisclaimerText" /> |
29 | 31 |
30 </LinearLayout> | 32 </LinearLayout> |
31 | 33 |
32 <FrameLayout | 34 <FrameLayout |
33 android:layout_width="match_parent" | 35 android:layout_width="match_parent" |
34 android:layout_height="wrap_content" | 36 android:layout_height="wrap_content" |
35 android:layout_marginTop="16dp" | 37 android:layout_marginTop="4dp" |
36 android:background="@drawable/list_item_single" > | 38 android:background="@drawable/list_item_single" > |
37 | 39 |
| 40 <!-- TODO(twellington): change start/end padding back to 16dp |
| 41 when new assets with correct built in padding |
| 42 are available. --> |
38 <Button | 43 <Button |
39 android:id="@+id/clear_browsing_data_button" | 44 android:id="@+id/clear_browsing_data_button" |
40 android:layout_width="match_parent" | 45 android:layout_width="match_parent" |
41 android:layout_height="wrap_content" | 46 android:layout_height="wrap_content" |
42 style="@style/ButtonCompatBorderless" | 47 style="@style/ButtonCompatBorderless" |
43 android:paddingTop="16dp" | 48 android:paddingTop="16dp" |
44 android:paddingBottom="16dp" | 49 android:paddingBottom="16dp" |
45 android:paddingStart="16dp" | 50 android:paddingStart="17dp" |
46 android:paddingEnd="16dp" | 51 android:paddingEnd="17dp" |
47 android:gravity="center_vertical|start" | 52 android:gravity="center_vertical|start" |
48 android:text="@string/open_clear_browsing_data_dialog_button" | 53 android:text="@string/open_clear_browsing_data_dialog_button" |
49 android:textAllCaps="true" | 54 android:textAllCaps="true" |
50 android:textColor="@color/history_cbd_button_tint" | 55 android:textColor="@color/history_cbd_button_tint" |
51 android:textSize="14sp" /> | 56 android:textSize="14sp" /> |
52 | 57 |
53 </FrameLayout> | 58 </FrameLayout> |
54 </LinearLayout> | 59 </LinearLayout> |
OLD | NEW |