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 <!-- Header containing information about the site. | 6 <!-- Header containing information about the site. |
7 Java code inflating this layout manages the hiding and adjustment of elemen
ts in the layout. | 7 Java code inflating this layout manages the hiding and adjustment of elemen
ts in the layout. |
8 Request dialog: Displays an X in the top right corner, allowing the user to
close it. | 8 Request dialog: Displays an X in the top right corner, allowing the user to
close it. |
9 Result dialog: Displays no X. Title goes all the way to the end. | 9 Result dialog: Displays no X. Title goes all the way to the end. |
10 --> | 10 --> |
11 <merge xmlns:android="http://schemas.android.com/apk/res/android" > | 11 <merge xmlns:android="http://schemas.android.com/apk/res/android" > |
12 | 12 |
13 <FrameLayout | 13 <org.chromium.chrome.browser.payments.ui.PaymentRequestHeader |
| 14 android:id="@+id/header" |
14 android:layout_height="wrap_content" | 15 android:layout_height="wrap_content" |
15 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
16 android:minHeight="64dp" | 17 android:minHeight="64dp" |
17 android:background="@android:color/white" > | 18 android:background="@android:color/white" > |
18 | 19 |
19 <ImageView | 20 <ImageView |
20 android:id="@+id/icon_view" | 21 android:id="@+id/icon_view" |
21 android:layout_height="24dp" | 22 android:layout_height="24dp" |
22 android:layout_width="24dp" | 23 android:layout_width="24dp" |
23 android:layout_marginStart="16dp" | 24 android:layout_marginStart="16dp" |
24 android:layout_marginEnd="16dp" | 25 android:layout_marginEnd="16dp" |
25 android:layout_gravity="start|center_vertical" | 26 android:layout_gravity="start|center_vertical" |
26 android:importantForAccessibility="no" | 27 android:importantForAccessibility="no" |
27 android:scaleType="centerInside" /> | 28 android:scaleType="centerInside" /> |
28 | 29 |
29 <LinearLayout | 30 <LinearLayout |
30 android:id="@+id/page_info" | 31 android:id="@+id/page_info" |
31 android:layout_height="wrap_content" | 32 android:layout_height="wrap_content" |
32 android:layout_width="wrap_content" | 33 android:layout_width="wrap_content" |
33 android:layout_marginStart="56dp" | 34 android:layout_marginStart="50dp" |
34 android:layout_marginEnd="56dp" | 35 android:layout_marginEnd="50dp" |
35 android:layout_marginBottom="@dimen/payments_section_vertical_spacin
g" | 36 android:layout_marginBottom="@dimen/payments_section_vertical_spacin
g" |
36 android:layout_marginTop="@dimen/payments_section_vertical_spacing" | 37 android:layout_marginTop="@dimen/payments_section_vertical_spacing" |
37 android:layout_gravity="center_vertical" | 38 android:layout_gravity="center_vertical" |
38 android:orientation="vertical"> | 39 android:orientation="vertical"> |
39 | 40 |
40 <TextView | 41 <TextView |
41 android:id="@+id/page_title" | 42 android:id="@+id/page_title" |
42 android:layout_height="wrap_content" | 43 android:layout_height="wrap_content" |
43 android:layout_width="wrap_content" | 44 android:layout_width="wrap_content" |
| 45 android:paddingStart="6dp" |
44 android:ellipsize="end" | 46 android:ellipsize="end" |
45 android:maxLines="1" | 47 android:maxLines="1" |
46 android:singleLine="true" | 48 android:singleLine="true" |
47 android:textColor="@color/default_text_color" | 49 android:textColor="@color/default_text_color" |
48 android:textSize="16sp" | 50 android:textSize="16sp" |
49 android:textStyle="bold" /> | 51 android:textStyle="bold" /> |
50 | 52 |
51 <TextView | 53 <TextView |
52 android:id="@+id/hostname" | 54 android:id="@+id/hostname" |
53 android:layout_height="wrap_content" | 55 android:layout_height="wrap_content" |
54 android:layout_width="wrap_content" | 56 android:layout_width="wrap_content" |
| 57 android:paddingStart="6dp" |
| 58 android:gravity="center_vertical" |
55 android:ellipsize="start" | 59 android:ellipsize="start" |
56 android:maxLines="1" | 60 android:maxLines="1" |
57 android:singleLine="true" | 61 android:singleLine="true" |
58 android:textColor="@color/descriptive_text_color" | 62 android:textColor="@color/descriptive_text_color" |
59 android:textSize="14sp" /> | 63 android:textSize="14sp" /> |
60 </LinearLayout> | 64 </LinearLayout> |
61 | 65 |
62 <ImageView | 66 <ImageView |
63 android:id="@+id/close_button" | 67 android:id="@+id/close_button" |
64 android:layout_gravity="end|center_vertical" | 68 android:layout_gravity="end|center_vertical" |
65 android:layout_height="56dp" | 69 android:layout_height="56dp" |
66 android:layout_width="56dp" | 70 android:layout_width="56dp" |
67 android:src="@drawable/btn_close" | 71 android:src="@drawable/btn_close" |
68 android:contentDescription="@string/close" | 72 android:contentDescription="@string/close" |
69 android:background="?attr/selectableItemBackground" | 73 android:background="?attr/selectableItemBackground" |
70 android:scaleType="center" /> | 74 android:scaleType="center" /> |
71 </FrameLayout> | 75 </org.chromium.chrome.browser.payments.ui.PaymentRequestHeader> |
72 | 76 |
73 </merge> | 77 </merge> |
OLD | NEW |