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 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 | 6 <LinearLayout |
7 xmlns:android="http://schemas.android.com/apk/res/android" | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
8 android:layout_width="match_parent" | 8 android:layout_width="match_parent" |
9 android:layout_height="wrap_content" | 9 android:layout_height="wrap_content" |
| 10 android:gravity="center_vertical" |
10 android:minHeight="64dp" | 11 android:minHeight="64dp" |
11 android:paddingStart="@dimen/account_chooser_dialog_item_margin" | 12 android:paddingStart="@dimen/account_chooser_dialog_item_margin" |
12 android:paddingEnd="@dimen/account_chooser_dialog_item_margin" | 13 android:paddingEnd="@dimen/account_chooser_dialog_item_margin" |
13 android:orientation="horizontal" > | 14 android:orientation="horizontal" > |
14 <ImageView | 15 <ImageView |
15 android:id="@+id/profile_image" | 16 android:id="@+id/profile_image" |
16 android:layout_width="40dp" | 17 android:layout_width="40dp" |
17 android:layout_height="40dp" | 18 android:layout_height="40dp" |
18 android:layout_gravity="center_vertical" | |
19 android:contentDescription="@null"/> | 19 android:contentDescription="@null"/> |
20 <LinearLayout | 20 <LinearLayout |
21 android:layout_width="wrap_content" | 21 android:layout_width="wrap_content" |
22 android:layout_height="wrap_content" | 22 android:layout_height="wrap_content" |
23 android:layout_gravity="center_vertical" | |
24 android:layout_margin="8dp" | 23 android:layout_margin="8dp" |
25 android:layout_marginStart="16dp" | 24 android:layout_marginStart="16dp" |
26 android:orientation="vertical"> | 25 android:orientation="vertical"> |
27 <TextView | 26 <TextView |
28 android:id="@+id/main_name" | 27 android:id="@+id/main_name" |
29 android:layout_width="wrap_content" | 28 android:layout_width="wrap_content" |
30 android:layout_height="wrap_content" | 29 android:layout_height="wrap_content" |
31 android:ellipsize="end" | 30 android:ellipsize="end" |
32 android:singleLine="true" | 31 android:singleLine="true" |
33 android:fontFamily="sans-serif" | 32 android:fontFamily="sans-serif" |
34 android:textColor="@color/default_text_color" | 33 android:textColor="@color/default_text_color" |
35 android:textSize="@dimen/account_chooser_dialog_title_main_text_size
"/> | 34 android:textSize="@dimen/account_chooser_dialog_title_main_text_size
"/> |
36 <TextView | 35 <TextView |
37 android:id="@+id/secondary_name" | 36 android:id="@+id/secondary_name" |
38 android:layout_width="wrap_content" | 37 android:layout_width="wrap_content" |
39 android:layout_height="wrap_content" | 38 android:layout_height="wrap_content" |
40 android:ellipsize="end" | 39 android:ellipsize="end" |
41 android:singleLine="true" | 40 android:singleLine="true" |
42 android:fontFamily="sans-serif" | 41 android:fontFamily="sans-serif" |
43 android:textColor="@color/descriptive_text_color" | 42 android:textColor="@color/descriptive_text_color" |
44 android:textSize="@dimen/account_chooser_dialog_title_descriptive_te
xt_size"/> | 43 android:textSize="@dimen/account_chooser_dialog_title_descriptive_te
xt_size"/> |
45 </LinearLayout> | 44 </LinearLayout> |
| 45 <!-- Needed to make the following ImageButton align to the right. --> |
| 46 <Space |
| 47 android:layout_width="0dp" |
| 48 android:layout_height="0dp" |
| 49 android:layout_weight="1" /> |
| 50 <ImageButton |
| 51 android:id="@+id/psl_info_btn" |
| 52 android:layout_height="wrap_content" |
| 53 android:layout_width="wrap_content" |
| 54 android:background="?attr/selectableItemBackground" |
| 55 android:contentDescription="@null" |
| 56 android:padding="4dp" |
| 57 android:src="@drawable/btn_info" |
| 58 android:visibility="gone"/> |
46 </LinearLayout> | 59 </LinearLayout> |
OLD | NEW |