| 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 | 10 |
| 11 <org.chromium.ui.widget.TextViewWithClickableSpans | 11 <org.chromium.ui.widget.TextViewWithClickableSpans |
| 12 android:id="@+id/signed_in_not_synced" | 12 android:id="@+id/signed_in_not_synced" |
| 13 style="@style/PrivacyDisclaimerText" /> | 13 style="@style/PrivacyDisclaimerText" /> |
| 14 | 14 |
| 15 <org.chromium.ui.widget.TextViewWithClickableSpans | 15 <org.chromium.ui.widget.TextViewWithClickableSpans |
| 16 android:id="@+id/signed_in_synced" | 16 android:id="@+id/signed_in_synced" |
| 17 style="@style/PrivacyDisclaimerText" /> | 17 style="@style/PrivacyDisclaimerText" /> |
| 18 | 18 |
| 19 <org.chromium.ui.widget.TextViewWithClickableSpans | 19 <org.chromium.ui.widget.TextViewWithClickableSpans |
| 20 android:id="@+id/other_forms_of_browsing_history" | 20 android:id="@+id/other_forms_of_browsing_history" |
| 21 style="@style/PrivacyDisclaimerText" /> | 21 style="@style/PrivacyDisclaimerText" /> |
| 22 | 22 |
| 23 <Button | 23 <FrameLayout |
| 24 android:id="@+id/clear_browsing_data_button" | |
| 25 android:layout_width="match_parent" | 24 android:layout_width="match_parent" |
| 26 android:layout_height="wrap_content" | 25 android:layout_height="wrap_content" |
| 27 android:layout_marginTop="16dp" | 26 android:layout_marginTop="16dp" |
| 28 style="@style/ButtonCompatBorderless" | 27 android:layout_marginBottom="8dp" |
| 29 android:paddingTop="16dp" | 28 android:background="@android:color/white" > |
| 30 android:paddingBottom="16dp" | 29 |
| 31 android:paddingStart="16dp" | 30 <Button |
| 32 android:paddingEnd="16dp" | 31 android:id="@+id/clear_browsing_data_button" |
| 33 android:gravity="center_vertical|start" | 32 android:layout_width="match_parent" |
| 34 android:text="@string/open_clear_browsing_data_dialog_button" | 33 android:layout_height="wrap_content" |
| 35 android:textAllCaps="true" | 34 style="@style/ButtonCompatBorderless" |
| 36 android:textColor="@color/light_active_color" | 35 android:paddingTop="16dp" |
| 37 android:textSize="16sp" /> | 36 android:paddingBottom="16dp" |
| 37 android:paddingStart="16dp" |
| 38 android:paddingEnd="16dp" |
| 39 android:gravity="center_vertical|start" |
| 40 android:text="@string/open_clear_browsing_data_dialog_button" |
| 41 android:textAllCaps="true" |
| 42 android:textColor="@color/history_cbd_button_tint" |
| 43 android:textSize="16sp" /> |
| 44 |
| 45 </FrameLayout> |
| 38 </LinearLayout> | 46 </LinearLayout> |
| OLD | NEW |