OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2015 Google Inc. All Rights Reserved. | 2 <!-- Copyright 2015 Google Inc. All Rights Reserved. |
3 | 3 |
4 Licensed under the Apache License, Version 2.0 (the "License"); | 4 Licensed under the Apache License, Version 2.0 (the "License"); |
5 you may not use this file except in compliance with the License. | 5 you may not use this file except in compliance with the License. |
6 You may obtain a copy of the License at | 6 You may obtain a copy of the License at |
7 | 7 |
8 http://www.apache.org/licenses/LICENSE-2.0 | 8 http://www.apache.org/licenses/LICENSE-2.0 |
9 | 9 |
10 Unless required by applicable law or agreed to in writing, software | 10 Unless required by applicable law or agreed to in writing, software |
(...skipping 22 matching lines...) Expand all Loading... | |
33 | 33 |
34 <EditText | 34 <EditText |
35 android:id="@+id/url" | 35 android:id="@+id/url" |
36 android:text="@string/default_test_url" | 36 android:text="@string/default_test_url" |
37 android:layout_width="match_parent" | 37 android:layout_width="match_parent" |
38 android:layout_height="wrap_content" | 38 android:layout_height="wrap_content" |
39 android:inputType="textUri" /> | 39 android:inputType="textUri" /> |
40 | 40 |
41 <LinearLayout | 41 <LinearLayout |
42 android:layout_width="match_parent" | 42 android:layout_width="match_parent" |
43 android:layout_height="wrap_content" | |
44 android:paddingTop="@dimen/view_vertical_margin" | |
45 android:orientation="vertical"> | |
46 | |
47 <TextView | |
48 android:layout_width="wrap_content" | |
49 android:layout_height="wrap_content" | |
50 android:textSize="@dimen/abc_text_size_medium_material" | |
51 android:text="@string/label_toobar_color"/> | |
52 | |
53 <EditText | |
54 android:id="@+id/custom_toolbar_color" | |
55 android:layout_width="match_parent" | |
56 android:layout_height="wrap_content" | |
57 android:singleLine="true" | |
58 android:hint="@string/default_toolbar_color" | |
59 android:text="@string/default_toolbar_color"/> | |
60 | |
61 </LinearLayout> | |
62 | |
63 <LinearLayout | |
64 android:layout_width="match_parent" | |
65 android:paddingTop="@dimen/view_vertical_margin" | 43 android:paddingTop="@dimen/view_vertical_margin" |
66 android:orientation="horizontal" | 44 android:orientation="horizontal" |
67 android:layout_height="wrap_content"> | 45 android:layout_height="@dimen/view_height"> |
Ian Wen
2016/03/16 01:35:30
Setting height on textview is potentially dangerou
BigBossZhiling
2016/03/18 00:59:07
Done.
| |
68 | 46 |
69 <TextView | 47 <TextView |
70 android:layout_width="0dp" | 48 android:layout_width="0dp" |
71 android:layout_height="wrap_content" | 49 android:layout_height="wrap_content" |
72 android:layout_weight="1" | 50 android:layout_weight="1" |
73 android:textSize="@dimen/abc_text_size_medium_material" | 51 android:textSize="@dimen/abc_text_size_medium_material" |
74 android:text="@string/label_add_action_button"/> | 52 android:text="@string/label_add_action_button"/> |
75 | 53 |
76 <CheckBox | 54 <CheckBox |
77 android:id="@+id/custom_show_action_button" | 55 android:id="@+id/custom_show_action_button" |
78 android:layout_width="wrap_content" | 56 android:layout_width="wrap_content" |
79 android:layout_height="wrap_content" /> | 57 android:layout_height="wrap_content" /> |
80 | 58 |
81 </LinearLayout> | 59 </LinearLayout> |
82 | 60 |
83 <LinearLayout | 61 <LinearLayout |
84 android:layout_width="match_parent" | 62 android:layout_width="match_parent" |
85 android:paddingTop="@dimen/view_vertical_margin" | 63 android:paddingTop="@dimen/view_vertical_margin" |
86 android:layout_height="wrap_content"> | 64 android:layout_height="@dimen/view_height"> |
87 | 65 |
88 <TextView | 66 <TextView |
89 android:layout_width="0dp" | 67 android:layout_width="0dp" |
90 android:layout_height="wrap_content" | 68 android:layout_height="wrap_content" |
91 android:layout_weight="1" | 69 android:layout_weight="1" |
92 android:textSize="@dimen/abc_text_size_medium_material" | 70 android:textSize="@dimen/abc_text_size_medium_material" |
93 android:text="@string/label_add_menus"/> | 71 android:text="@string/label_add_menus"/> |
94 | 72 |
95 <CheckBox | 73 <CheckBox |
96 android:id="@+id/custom_add_menus" | 74 android:id="@+id/custom_add_menus" |
97 android:layout_width="wrap_content" | 75 android:layout_width="wrap_content" |
98 android:layout_height="wrap_content" /> | 76 android:layout_height="wrap_content" /> |
99 | 77 |
100 </LinearLayout> | 78 </LinearLayout> |
101 | 79 |
102 <LinearLayout | 80 <LinearLayout |
103 android:layout_width="match_parent" | 81 android:layout_width="match_parent" |
104 android:paddingTop="@dimen/view_vertical_margin" | 82 android:paddingTop="@dimen/view_vertical_margin" |
105 android:layout_height="wrap_content"> | 83 android:layout_height="@dimen/view_height"> |
106 | 84 |
107 <TextView | 85 <TextView |
108 android:layout_width="0dp" | 86 android:layout_width="0dp" |
109 android:layout_height="wrap_content" | 87 android:layout_height="wrap_content" |
110 android:layout_weight="1" | 88 android:layout_weight="1" |
111 android:textSize="@dimen/abc_text_size_medium_material" | 89 android:textSize="@dimen/abc_text_size_medium_material" |
112 android:text="@string/label_show_title"/> | 90 android:text="@string/label_show_title"/> |
113 | 91 |
114 <CheckBox | 92 <CheckBox |
115 android:id="@+id/show_title" | 93 android:id="@+id/show_title" |
116 android:layout_width="wrap_content" | 94 android:layout_width="wrap_content" |
117 android:layout_height="wrap_content" /> | 95 android:layout_height="wrap_content" /> |
118 | 96 |
119 </LinearLayout> | 97 </LinearLayout> |
120 | 98 |
121 <LinearLayout | 99 <LinearLayout |
122 android:layout_width="match_parent" | 100 android:layout_width="match_parent" |
123 android:paddingTop="@dimen/view_vertical_margin" | 101 android:paddingTop="@dimen/view_vertical_margin" |
124 android:layout_height="wrap_content"> | 102 android:layout_height="@dimen/view_height"> |
125 | 103 |
126 <TextView | 104 <TextView |
127 android:layout_width="0dp" | 105 android:layout_width="0dp" |
128 android:layout_height="wrap_content" | 106 android:layout_height="wrap_content" |
129 android:layout_weight="1" | 107 android:layout_weight="1" |
130 android:textSize="@dimen/abc_text_size_medium_material" | 108 android:textSize="@dimen/abc_text_size_medium_material" |
131 android:text="@string/label_custom_back_button"/> | 109 android:text="@string/label_custom_back_button"/> |
132 | 110 |
133 <CheckBox | 111 <CheckBox |
134 android:id="@+id/custom_back_button" | 112 android:id="@+id/custom_back_button" |
135 android:layout_width="wrap_content" | 113 android:layout_width="wrap_content" |
136 android:layout_height="wrap_content" /> | 114 android:layout_height="wrap_content" /> |
137 | 115 |
138 </LinearLayout> | 116 </LinearLayout> |
139 | 117 |
140 <LinearLayout | 118 <LinearLayout |
141 android:layout_width="match_parent" | 119 android:layout_width="match_parent" |
142 android:paddingTop="@dimen/view_vertical_margin" | 120 android:paddingTop="@dimen/view_vertical_margin" |
143 android:layout_height="wrap_content"> | 121 android:layout_height="@dimen/view_height"> |
144 | 122 |
145 <TextView | 123 <TextView |
146 android:layout_width="0dp" | 124 android:layout_width="0dp" |
147 android:layout_height="wrap_content" | 125 android:layout_height="wrap_content" |
148 android:layout_weight="1" | 126 android:layout_weight="1" |
149 android:textSize="@dimen/abc_text_size_medium_material" | 127 android:textSize="@dimen/abc_text_size_medium_material" |
150 android:text="@string/label_auto_hide_appbar"/> | 128 android:text="@string/label_auto_hide_appbar"/> |
151 | 129 |
152 <CheckBox | 130 <CheckBox |
153 android:id="@+id/auto_hide_checkbox" | 131 android:id="@+id/auto_hide_checkbox" |
154 android:layout_width="wrap_content" | 132 android:layout_width="wrap_content" |
155 android:layout_height="wrap_content" /> | 133 android:layout_height="wrap_content" /> |
156 | 134 |
157 </LinearLayout> | 135 </LinearLayout> |
158 | 136 |
159 <Button | 137 <Button |
138 android:id="@+id/advanced_ui_setting" | |
139 android:layout_gravity="center_horizontal" | |
140 android:paddingTop="@dimen/button_padding_top" | |
141 android:layout_width="@dimen/button_width" | |
142 android:layout_height="@dimen/button_height" | |
143 android:textSize="@dimen/abc_text_size_medium_material" | |
144 android:text="@string/label_advanced_ui_setting" /> | |
145 | |
146 <Button | |
160 android:id="@+id/start_custom_tab" | 147 android:id="@+id/start_custom_tab" |
161 android:layout_gravity="center_horizontal" | 148 android:layout_gravity="center_horizontal" |
162 android:layout_width="wrap_content" | 149 android:paddingTop="@dimen/button_padding_top" |
163 android:layout_height="wrap_content" | 150 android:layout_width="@dimen/button_width" |
151 android:layout_height="@dimen/button_height" | |
152 android:textSize="@dimen/abc_text_size_medium_material" | |
164 android:text="@string/label_start_custom_tab" /> | 153 android:text="@string/label_start_custom_tab" /> |
165 | 154 |
166 </LinearLayout> | 155 </LinearLayout> |
OLD | NEW |