| 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 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | 6 <ScrollView 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="match_parent" | 8 android:layout_height="match_parent" |
| 9 android:fillViewport="true" > | 9 android:fillViewport="true" > |
| 10 | 10 |
| 11 <LinearLayout | 11 <LinearLayout |
| 12 android:id="@+id/password_entry_editor_interactive" | 12 android:id="@+id/password_entry_editor_interactive" |
| 13 android:layout_width="match_parent" | 13 android:layout_width="match_parent" |
| 14 android:layout_height="wrap_content" | 14 android:layout_height="wrap_content" |
| 15 android:orientation="vertical" | 15 android:orientation="vertical" |
| 16 android:title="@string/password_entry_editor_title" | 16 android:title="@string/password_entry_editor_title"> |
| 17 android:visibility="gone"> | |
| 18 | 17 |
| 19 <TextView | 18 <TextView |
| 20 android:text="@string/password_entry_editor_site_title" | 19 android:text="@string/password_entry_editor_site_title" |
| 21 android:textColor="@color/google_blue_700" | 20 android:textColor="@color/google_blue_700" |
| 22 android:layout_width="wrap_content" | 21 android:layout_width="wrap_content" |
| 23 android:layout_height="wrap_content" | 22 android:layout_height="wrap_content" |
| 24 android:layout_marginTop="10dp" | 23 android:layout_marginTop="10dp" |
| 25 android:layout_marginStart="15dp" | 24 android:layout_marginStart="15dp" |
| 26 android:gravity="center_vertical" | 25 android:gravity="center_vertical" |
| 27 android:textAppearance="?android:attr/textAppearanceMedium" /> | 26 android:textAppearance="?android:attr/textAppearanceMedium" /> |
| (...skipping 11 matching lines...) Expand all Loading... |
| 39 android:layout_marginTop="10dp" | 38 android:layout_marginTop="10dp" |
| 40 android:layout_marginStart="15dp" | 39 android:layout_marginStart="15dp" |
| 41 android:textAppearance="?android:attr/textAppearanceMedium" /> | 40 android:textAppearance="?android:attr/textAppearanceMedium" /> |
| 42 | 41 |
| 43 <View | 42 <View |
| 44 android:layout_width="0dp" | 43 android:layout_width="0dp" |
| 45 android:layout_height="0dp" | 44 android:layout_height="0dp" |
| 46 android:layout_weight="1" /> | 45 android:layout_weight="1" /> |
| 47 | 46 |
| 48 <ImageButton | 47 <ImageButton |
| 48 android:id="@+id/password_entry_editor_copy_site" |
| 49 style="?android:attr/buttonStyleSmall" | 49 style="?android:attr/buttonStyleSmall" |
| 50 android:background="@null" |
| 50 android:layout_width="match_parent" | 51 android:layout_width="match_parent" |
| 51 android:layout_height="wrap_content" | 52 android:layout_height="wrap_content" |
| 52 android:layout_gravity="end" | 53 android:layout_gravity="end" |
| 53 android:layout_marginTop="10dp" | 54 android:layout_marginTop="10dp" |
| 54 android:layout_marginEnd="15dp" | 55 android:layout_marginEnd="15dp" |
| 55 android:src="@drawable/ic_content_copy" | 56 android:src="@drawable/ic_content_copy" |
| 56 android:contentDescription="@string/password_entry_editor_copy_s
tored_site" /> | 57 android:contentDescription="@string/password_entry_editor_copy_s
tored_site" /> |
| 57 | 58 |
| 58 </LinearLayout> | 59 </LinearLayout> |
| 59 | 60 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 81 android:layout_marginStart="15dp" | 82 android:layout_marginStart="15dp" |
| 82 android:textAppearance="?android:attr/textAppearanceMedium" | 83 android:textAppearance="?android:attr/textAppearanceMedium" |
| 83 android:contentDescription="@string/password_entry_editor_copy_s
tored_username" /> | 84 android:contentDescription="@string/password_entry_editor_copy_s
tored_username" /> |
| 84 | 85 |
| 85 <View | 86 <View |
| 86 android:layout_width="0dp" | 87 android:layout_width="0dp" |
| 87 android:layout_height="0dp" | 88 android:layout_height="0dp" |
| 88 android:layout_weight="1" /> | 89 android:layout_weight="1" /> |
| 89 | 90 |
| 90 <ImageButton | 91 <ImageButton |
| 92 android:id="@+id/password_entry_editor_copy_username" |
| 91 style="?android:attr/buttonStyleSmall" | 93 style="?android:attr/buttonStyleSmall" |
| 94 android:background="@null" |
| 92 android:layout_width="match_parent" | 95 android:layout_width="match_parent" |
| 93 android:layout_height="wrap_content" | 96 android:layout_height="wrap_content" |
| 94 android:layout_gravity="end" | 97 android:layout_gravity="end" |
| 95 android:layout_marginTop="10dp" | 98 android:layout_marginTop="10dp" |
| 96 android:layout_marginEnd="15dp" | 99 android:layout_marginEnd="15dp" |
| 97 android:src="@drawable/ic_content_copy" /> | 100 android:src="@drawable/ic_content_copy" /> |
| 98 | 101 |
| 99 </LinearLayout> | 102 </LinearLayout> |
| 100 | 103 |
| 101 <TextView | 104 <TextView |
| (...skipping 11 matching lines...) Expand all Loading... |
| 113 android:layout_height="wrap_content" | 116 android:layout_height="wrap_content" |
| 114 android:orientation="horizontal"> | 117 android:orientation="horizontal"> |
| 115 | 118 |
| 116 <TextView | 119 <TextView |
| 117 android:id="@+id/password_entry_editor_password" | 120 android:id="@+id/password_entry_editor_password" |
| 118 android:textColor="@color/default_text_color" | 121 android:textColor="@color/default_text_color" |
| 119 android:layout_width="fill_parent" | 122 android:layout_width="fill_parent" |
| 120 android:layout_height="wrap_content" | 123 android:layout_height="wrap_content" |
| 121 android:layout_marginTop="10dp" | 124 android:layout_marginTop="10dp" |
| 122 android:layout_marginStart="15dp" | 125 android:layout_marginStart="15dp" |
| 126 android:inputType="textPassword" |
| 123 android:textAppearance="?android:attr/textAppearanceMedium" /> | 127 android:textAppearance="?android:attr/textAppearanceMedium" /> |
| 124 | 128 |
| 125 <View | 129 <View |
| 126 android:layout_width="0dp" | 130 android:layout_width="0dp" |
| 127 android:layout_height="0dp" | 131 android:layout_height="0dp" |
| 128 android:layout_weight="1" /> | 132 android:layout_weight="1" /> |
| 129 | 133 |
| 130 <ImageButton | 134 <ImageButton |
| 135 android:id="@+id/password_entry_editor_view_password" |
| 136 android:background="@null" |
| 131 style="?android:attr/buttonStyleSmall" | 137 style="?android:attr/buttonStyleSmall" |
| 132 android:layout_width="match_parent" | 138 android:layout_width="match_parent" |
| 133 android:layout_height="wrap_content" | 139 android:layout_height="wrap_content" |
| 134 android:layout_gravity="end" | 140 android:layout_gravity="end" |
| 135 android:layout_marginTop="10dp" | 141 android:layout_marginTop="10dp" |
| 136 android:layout_marginEnd="15dp" | 142 android:layout_marginEnd="15dp" |
| 137 android:src="@drawable/ic_visibility" | 143 android:src="@drawable/ic_visibility" |
| 138 android:contentDescription="@string/password_entry_editor_view_s
tored_password" /> | 144 android:contentDescription="@string/password_entry_editor_view_s
tored_password" /> |
| 139 | 145 |
| 140 <ImageButton | 146 <ImageButton |
| 147 android:id="@+id/password_entry_editor_copy_password" |
| 148 android:background="@null" |
| 141 style="?android:attr/buttonStyleSmall" | 149 style="?android:attr/buttonStyleSmall" |
| 142 android:layout_width="match_parent" | 150 android:layout_width="match_parent" |
| 143 android:layout_height="wrap_content" | 151 android:layout_height="wrap_content" |
| 144 android:layout_gravity="end" | 152 android:layout_gravity="end" |
| 145 android:layout_marginTop="10dp" | 153 android:layout_marginTop="10dp" |
| 146 android:layout_marginEnd="15dp" | 154 android:layout_marginEnd="15dp" |
| 147 android:src="@drawable/ic_content_copy" | 155 android:src="@drawable/ic_content_copy" |
| 148 android:contentDescription="@string/password_entry_editor_copy_s
tored_password" /> | 156 android:contentDescription="@string/password_entry_editor_copy_s
tored_password" /> |
| 149 | 157 |
| 150 </LinearLayout> | 158 </LinearLayout> |
| 151 | 159 |
| 152 </LinearLayout> | 160 </LinearLayout> |
| 153 | 161 |
| 154 </ScrollView> | 162 </ScrollView> |
| OLD | NEW |