OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- | 2 <!-- |
3 Copyright 2015 The Chromium Authors. All rights reserved. | 3 Copyright 2015 The Chromium Authors. All rights reserved. |
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 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 7 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" | 8 xmlns:chrome="http://schemas.android.com/apk/res-auto" |
9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
10 android:layout_height="match_parent" | 10 android:layout_height="match_parent" |
11 android:orientation="vertical" > | 11 android:orientation="vertical" > |
12 | 12 |
13 <android.support.v7.widget.Toolbar | 13 <android.support.v7.widget.Toolbar |
14 android:id="@+id/toolbar" | 14 android:id="@+id/toolbar" |
15 android:layout_width="match_parent" | 15 android:layout_width="match_parent" |
16 android:layout_height="?attr/actionBarSize" | 16 android:layout_height="?attr/actionBarSize" |
17 android:background="?attr/colorPrimary" /> | 17 android:background="?attr/colorPrimary" /> |
18 | 18 |
19 <View | 19 <View |
20 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
21 android:layout_height="4dp" | 21 android:layout_height="4dp" |
22 android:layout_marginBottom="-4dp" | 22 android:layout_marginBottom="-4dp" |
23 android:background="@drawable/eb_title_bar_shadow" /> | 23 android:background="@drawable/eb_title_bar_shadow" /> |
24 | 24 |
25 <ScrollView | 25 <ScrollView |
26 android:layout_width="match_parent" | 26 android:layout_width="match_parent" |
27 android:layout_height="match_parent" > | 27 android:layout_height="match_parent" > |
28 | 28 |
29 <LinearLayout | 29 <LinearLayout |
Ian Wen
2015/08/07 17:22:53
The added spacings are too much. In mocks this lin
Kibeom Kim (inactive)
2015/08/10 19:02:15
still different but confirmed with cleer@ at the b
| |
30 android:layout_width="match_parent" | 30 android:layout_width="match_parent" |
31 android:layout_height="wrap_content" | 31 android:layout_height="wrap_content" |
32 android:layout_marginEnd="16dp" | 32 android:layout_marginEnd="16dp" |
33 android:layout_marginStart="16dp" | 33 android:layout_marginStart="16dp" |
34 android:layout_marginTop="8dp" | 34 android:layout_marginTop="8dp" |
35 android:layout_marginBottom="8dp" | 35 android:layout_marginBottom="8dp" |
36 android:orientation="vertical" > | 36 android:orientation="vertical" > |
37 | 37 |
38 <android.support.design.widget.TextInputLayout | 38 <android.support.design.widget.TextInputLayout |
39 android:layout_width="match_parent" | 39 android:layout_width="match_parent" |
40 android:layout_height="wrap_content" > | 40 android:layout_height="wrap_content" |
41 | 41 android:layout_marginTop="10dp" |
42 android:layout_marginBottom="10dp" > | |
42 <!-- android:text is set here is to avoid UI jumping. --> | 43 <!-- android:text is set here is to avoid UI jumping. --> |
43 <org.chromium.chrome.browser.widget.EmptyAlertEditText | 44 <org.chromium.chrome.browser.widget.EmptyAlertEditText |
44 android:id="@+id/title_text" | 45 android:id="@+id/title_text" |
45 android:layout_width="match_parent" | 46 android:layout_width="match_parent" |
46 android:layout_height="wrap_content" | 47 android:layout_height="wrap_content" |
47 android:hint="@string/bookmark_name" | 48 android:hint="@string/bookmark_name" |
48 android:text="@string/bookmark_name" | 49 android:text="@string/bookmark_name" |
49 android:imeOptions="flagNoExtractUi" | 50 android:imeOptions="flagNoExtractUi" |
50 android:inputType="textCapSentences|textAutoCorrect" | 51 android:inputType="textCapSentences|textAutoCorrect" |
51 android:singleLine="true" | 52 android:singleLine="true" |
52 chrome:alertMessage="@string/bookmark_missing_title" /> | 53 chrome:alertMessage="@string/bookmark_missing_title" /> |
53 </android.support.design.widget.TextInputLayout> | 54 </android.support.design.widget.TextInputLayout> |
54 | 55 |
55 <TextView | 56 <TextView |
56 android:layout_width="wrap_content" | 57 android:layout_width="wrap_content" |
57 android:layout_height="wrap_content" | 58 android:layout_height="wrap_content" |
58 android:paddingEnd="3dp" | 59 android:layout_marginTop="10dp" |
59 android:paddingStart="3dp" | 60 android:layout_marginBottom="8dp" |
60 android:paddingTop="8dp" | 61 android:layout_marginStart="3dp" |
62 android:layout_marginEnd="3dp" | |
61 android:text="@string/bookmark_folder" | 63 android:text="@string/bookmark_folder" |
62 android:textAppearance="@style/TextAppearance.AppCompat.Small" / > | 64 android:textAppearance="?android:attr/textAppearanceSmall" |
65 android:textSize="12sp" /> | |
63 | 66 |
64 <TextView | 67 <TextView |
65 android:id="@+id/folder_text" | 68 android:id="@+id/folder_text" |
66 android:layout_width="match_parent" | 69 android:layout_width="match_parent" |
67 android:layout_height="wrap_content" | 70 android:layout_height="wrap_content" |
68 android:paddingBottom="8dp" | 71 android:layout_marginTop="8dp" |
69 android:paddingEnd="3dp" | 72 android:layout_marginBottom="12dp" |
70 android:paddingStart="3dp" | 73 android:layout_marginStart="3dp" |
71 android:paddingTop="8dp" | 74 android:layout_marginEnd="3dp" |
72 android:textAppearance="@style/TextAppearance.AppCompat.Medium" | 75 android:textAppearance="?android:attr/textAppearanceMedium" |
73 android:textColor="@color/dark_mode_tint" /> | 76 android:textColor="@color/dark_mode_tint" /> |
74 | 77 |
75 <android.support.design.widget.TextInputLayout | 78 <android.support.design.widget.TextInputLayout |
76 android:layout_width="match_parent" | 79 android:layout_width="match_parent" |
77 android:layout_height="wrap_content" > | 80 android:layout_height="wrap_content" |
81 android:layout_marginTop="10dp" | |
82 android:layout_marginBottom="10dp" > | |
78 | 83 |
79 <org.chromium.chrome.browser.widget.EmptyAlertEditText | 84 <org.chromium.chrome.browser.widget.EmptyAlertEditText |
80 android:id="@+id/url_text" | 85 android:id="@+id/url_text" |
81 android:layout_width="match_parent" | 86 android:layout_width="match_parent" |
82 android:layout_height="wrap_content" | 87 android:layout_height="wrap_content" |
83 android:hint="@string/bookmark_url" | 88 android:hint="@string/bookmark_url" |
84 android:text="@string/bookmark_url" | 89 android:text="@string/bookmark_url" |
85 android:imeOptions="flagNoExtractUi" | 90 android:imeOptions="flagNoExtractUi" |
86 android:inputType="textUri" | 91 android:inputType="textUri" |
87 android:singleLine="true" | 92 android:singleLine="true" |
88 chrome:alertMessage="@string/bookmark_missing_url" /> | 93 chrome:alertMessage="@string/bookmark_missing_url" /> |
89 </android.support.design.widget.TextInputLayout> | 94 </android.support.design.widget.TextInputLayout> |
90 </LinearLayout> | 95 </LinearLayout> |
91 </ScrollView> | 96 </ScrollView> |
92 </LinearLayout> | 97 </LinearLayout> |
OLD | NEW |