| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 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 <org.chromium.chrome.browser.firstrun.AccountFirstRunView | 7 <org.chromium.chrome.browser.firstrun.AccountFirstRunView |
| 8 xmlns:android="http://schemas.android.com/apk/res/android" | 8 xmlns:android="http://schemas.android.com/apk/res/android" |
| 9 android:id="@+id/fre_account_layout" | 9 android:id="@+id/fre_account_layout" |
| 10 android:layout_width="match_parent" | 10 android:layout_width="match_parent" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 android:layout_gravity="bottom" | 86 android:layout_gravity="bottom" |
| 87 android:layout_marginBottom="56dp" /> | 87 android:layout_marginBottom="56dp" /> |
| 88 | 88 |
| 89 <LinearLayout | 89 <LinearLayout |
| 90 android:id="@+id/button_bar" | 90 android:id="@+id/button_bar" |
| 91 android:layout_width="match_parent" | 91 android:layout_width="match_parent" |
| 92 android:layout_height="56dp" | 92 android:layout_height="56dp" |
| 93 android:layout_gravity="bottom" | 93 android:layout_gravity="bottom" |
| 94 android:orientation="horizontal" > | 94 android:orientation="horizontal" > |
| 95 | 95 |
| 96 <!--suppress ButtonStyle --> |
| 96 <Button | 97 <Button |
| 97 android:id="@+id/negative_button" | 98 android:id="@+id/negative_button" |
| 98 android:layout_width="0dp" | 99 android:layout_width="0dp" |
| 99 android:layout_height="match_parent" | 100 android:layout_height="match_parent" |
| 100 android:layout_weight="1" | 101 android:layout_weight="1" |
| 101 android:background="?attr/listChoiceBackgroundIndicator" | 102 android:background="?attr/listChoiceBackgroundIndicator" |
| 102 android:gravity="start|center_vertical" | 103 android:gravity="start|center_vertical" |
| 103 android:textDirection="locale" | 104 android:textDirection="locale" |
| 104 android:padding="16dp" | 105 android:padding="16dp" |
| 105 android:text="@string/fre_skip_text" | 106 android:text="@string/fre_skip_text" |
| 106 android:textAllCaps="true" | 107 android:textAllCaps="true" |
| 107 android:textColor="@color/light_normal_color" | 108 android:textColor="@color/light_normal_color" |
| 108 android:textSize="@dimen/fre_button_text_size" /> | 109 android:textSize="@dimen/fre_button_text_size" /> |
| 109 | 110 |
| 111 <!--suppress ButtonStyle --> |
| 110 <Button | 112 <Button |
| 111 android:id="@+id/positive_button" | 113 android:id="@+id/positive_button" |
| 112 android:layout_width="0dp" | 114 android:layout_width="0dp" |
| 113 android:layout_height="match_parent" | 115 android:layout_height="match_parent" |
| 114 android:layout_weight="1" | 116 android:layout_weight="1" |
| 115 android:background="?attr/listChoiceBackgroundIndicator" | 117 android:background="?attr/listChoiceBackgroundIndicator" |
| 116 android:gravity="end|center_vertical" | 118 android:gravity="end|center_vertical" |
| 117 android:textDirection="locale" | 119 android:textDirection="locale" |
| 118 android:padding="16dp" | 120 android:padding="16dp" |
| 119 android:text="@string/choose_account_sign_in" | 121 android:text="@string/choose_account_sign_in" |
| 120 android:textAllCaps="true" | 122 android:textAllCaps="true" |
| 121 android:textColor="@color/light_active_color" | 123 android:textColor="@color/light_active_color" |
| 122 android:textSize="@dimen/fre_button_text_size" /> | 124 android:textSize="@dimen/fre_button_text_size" /> |
| 123 </LinearLayout> | 125 </LinearLayout> |
| 124 | 126 |
| 125 </org.chromium.chrome.browser.firstrun.AccountFirstRunView> | 127 </org.chromium.chrome.browser.firstrun.AccountFirstRunView> |
| OLD | NEW |