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 |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
104 <TextView | 104 <TextView |
105 android:text="@string/password_entry_editor_password" | 105 android:text="@string/password_entry_editor_password" |
106 android:textColor="@color/google_blue_700" | 106 android:textColor="@color/google_blue_700" |
107 android:layout_width="wrap_content" | 107 android:layout_width="wrap_content" |
108 android:layout_height="wrap_content" | 108 android:layout_height="wrap_content" |
109 android:layout_marginTop="5dp" | 109 android:layout_marginTop="5dp" |
110 android:layout_marginStart="15dp" | 110 android:layout_marginStart="15dp" |
111 android:gravity="center_vertical" | 111 android:gravity="center_vertical" |
112 android:textAppearance="?android:attr/textAppearanceMedium" /> | 112 android:textAppearance="?android:attr/textAppearanceMedium" /> |
113 | 113 |
114 <TextView | |
115 android:id="@+id/password_entry_editor_set_device_lock" | |
116 android:text="@string/password_entry_editor_set_device_lock_prompt" | |
117 android:textColor="@color/default_text_color" | |
118 android:layout_width="match_parent" | |
119 android:layout_height="match_parent" | |
120 android:layout_marginTop="10dp" | |
121 android:layout_marginStart="15dp" | |
Theresa
2016/08/12 18:34:28
This TextView and password_entry_editor_password s
dozsa
2016/08/18 12:40:37
Done.
| |
122 android:textAppearance="?android:attr/textAppearanceMedium" | |
123 android:visibility="gone" /> | |
124 | |
114 <LinearLayout | 125 <LinearLayout |
126 android:id="@+id/password_entry_editor_display_password" | |
115 android:layout_width="wrap_content" | 127 android:layout_width="wrap_content" |
116 android:layout_height="wrap_content" | 128 android:layout_height="wrap_content" |
117 android:orientation="horizontal"> | 129 android:orientation="horizontal"> |
118 | 130 |
119 <TextView | 131 <TextView |
120 android:id="@+id/password_entry_editor_password" | 132 android:id="@+id/password_entry_editor_password" |
121 android:textColor="@color/default_text_color" | 133 android:textColor="@color/default_text_color" |
122 android:layout_width="fill_parent" | 134 android:layout_width="match_parent" |
123 android:layout_height="wrap_content" | 135 android:layout_height="match_parent" |
124 android:layout_marginTop="10dp" | 136 android:layout_marginTop="10dp" |
125 android:layout_marginStart="15dp" | 137 android:layout_marginStart="15dp" |
126 android:inputType="textPassword" | 138 android:inputType="textPassword" |
127 android:textAppearance="?android:attr/textAppearanceMedium" /> | 139 android:textAppearance="?android:attr/textAppearanceMedium"/> |
Theresa
2016/08/12 18:34:28
nit: add the space back before the />
dozsa
2016/08/18 12:40:37
Done.
| |
128 | 140 |
129 <View | 141 <View |
142 android:id="@+id/password_entry_editor_spacer" | |
Theresa
2016/08/12 18:34:28
It doesn't look like this id is used anywhere.
dozsa
2016/08/18 12:40:37
True, I've removed it.
| |
130 android:layout_width="0dp" | 143 android:layout_width="0dp" |
131 android:layout_height="0dp" | 144 android:layout_height="0dp" |
132 android:layout_weight="1" /> | 145 android:layout_weight="1" /> |
133 | 146 |
134 <ImageButton | 147 <ImageButton |
135 android:id="@+id/password_entry_editor_view_password" | 148 android:id="@+id/password_entry_editor_view_password" |
136 android:background="@null" | 149 android:background="@null" |
137 style="?android:attr/buttonStyleSmall" | 150 style="?android:attr/buttonStyleSmall" |
138 android:layout_width="match_parent" | 151 android:layout_width="match_parent" |
139 android:layout_height="wrap_content" | 152 android:layout_height="wrap_content" |
(...skipping 13 matching lines...) Expand all Loading... | |
153 android:layout_marginTop="10dp" | 166 android:layout_marginTop="10dp" |
154 android:layout_marginEnd="15dp" | 167 android:layout_marginEnd="15dp" |
155 android:src="@drawable/ic_content_copy" | 168 android:src="@drawable/ic_content_copy" |
156 android:contentDescription="@string/password_entry_editor_copy_s tored_password" /> | 169 android:contentDescription="@string/password_entry_editor_copy_s tored_password" /> |
157 | 170 |
158 </LinearLayout> | 171 </LinearLayout> |
159 | 172 |
160 </LinearLayout> | 173 </LinearLayout> |
161 | 174 |
162 </ScrollView> | 175 </ScrollView> |
OLD | NEW |