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" |
| 45 android:minHeight="@dimen/view_height" |
67 android:layout_height="wrap_content"> | 46 android:layout_height="wrap_content"> |
68 | 47 |
69 <TextView | 48 <TextView |
70 android:layout_width="0dp" | 49 android:layout_width="0dp" |
71 android:layout_height="wrap_content" | 50 android:layout_height="wrap_content" |
72 android:layout_weight="1" | 51 android:layout_weight="1" |
73 android:textSize="@dimen/abc_text_size_medium_material" | 52 android:textSize="@dimen/abc_text_size_medium_material" |
74 android:text="@string/label_add_action_button"/> | 53 android:text="@string/label_add_action_button"/> |
75 | 54 |
76 <CheckBox | 55 <CheckBox |
77 android:id="@+id/custom_show_action_button" | 56 android:id="@+id/custom_show_action_button" |
78 android:layout_width="wrap_content" | 57 android:layout_width="wrap_content" |
79 android:layout_height="wrap_content" /> | 58 android:layout_height="wrap_content" /> |
80 | 59 |
81 </LinearLayout> | 60 </LinearLayout> |
82 | 61 |
83 <LinearLayout | 62 <LinearLayout |
84 android:layout_width="match_parent" | 63 android:layout_width="match_parent" |
85 android:paddingTop="@dimen/view_vertical_margin" | 64 android:paddingTop="@dimen/view_vertical_margin" |
| 65 android:minHeight="@dimen/view_height" |
86 android:layout_height="wrap_content"> | 66 android:layout_height="wrap_content"> |
87 | 67 |
88 <TextView | 68 <TextView |
89 android:layout_width="0dp" | 69 android:layout_width="0dp" |
90 android:layout_height="wrap_content" | 70 android:layout_height="wrap_content" |
91 android:layout_weight="1" | 71 android:layout_weight="1" |
92 android:textSize="@dimen/abc_text_size_medium_material" | 72 android:textSize="@dimen/abc_text_size_medium_material" |
93 android:text="@string/label_add_menus"/> | 73 android:text="@string/label_add_menus"/> |
94 | 74 |
95 <CheckBox | 75 <CheckBox |
96 android:id="@+id/custom_add_menus" | 76 android:id="@+id/custom_add_menus" |
97 android:layout_width="wrap_content" | 77 android:layout_width="wrap_content" |
98 android:layout_height="wrap_content" /> | 78 android:layout_height="wrap_content" /> |
99 | 79 |
100 </LinearLayout> | 80 </LinearLayout> |
101 | 81 |
102 <LinearLayout | 82 <LinearLayout |
103 android:layout_width="match_parent" | 83 android:layout_width="match_parent" |
104 android:paddingTop="@dimen/view_vertical_margin" | 84 android:paddingTop="@dimen/view_vertical_margin" |
| 85 android:minHeight="@dimen/view_height" |
105 android:layout_height="wrap_content"> | 86 android:layout_height="wrap_content"> |
106 | 87 |
107 <TextView | 88 <TextView |
108 android:layout_width="0dp" | 89 android:layout_width="0dp" |
109 android:layout_height="wrap_content" | 90 android:layout_height="wrap_content" |
110 android:layout_weight="1" | 91 android:layout_weight="1" |
111 android:textSize="@dimen/abc_text_size_medium_material" | 92 android:textSize="@dimen/abc_text_size_medium_material" |
112 android:text="@string/label_show_title"/> | 93 android:text="@string/label_show_title"/> |
113 | 94 |
114 <CheckBox | 95 <CheckBox |
115 android:id="@+id/show_title" | 96 android:id="@+id/show_title" |
116 android:layout_width="wrap_content" | 97 android:layout_width="wrap_content" |
117 android:layout_height="wrap_content" /> | 98 android:layout_height="wrap_content" /> |
118 | 99 |
119 </LinearLayout> | 100 </LinearLayout> |
120 | 101 |
121 <LinearLayout | 102 <LinearLayout |
122 android:layout_width="match_parent" | 103 android:layout_width="match_parent" |
123 android:paddingTop="@dimen/view_vertical_margin" | 104 android:paddingTop="@dimen/view_vertical_margin" |
| 105 android:minHeight="@dimen/view_height" |
124 android:layout_height="wrap_content"> | 106 android:layout_height="wrap_content"> |
125 | 107 |
126 <TextView | 108 <TextView |
127 android:layout_width="0dp" | 109 android:layout_width="0dp" |
128 android:layout_height="wrap_content" | 110 android:layout_height="wrap_content" |
129 android:layout_weight="1" | 111 android:layout_weight="1" |
130 android:textSize="@dimen/abc_text_size_medium_material" | 112 android:textSize="@dimen/abc_text_size_medium_material" |
131 android:text="@string/label_custom_back_button"/> | 113 android:text="@string/label_custom_back_button"/> |
132 | 114 |
133 <CheckBox | 115 <CheckBox |
134 android:id="@+id/custom_back_button" | 116 android:id="@+id/custom_back_button" |
135 android:layout_width="wrap_content" | 117 android:layout_width="wrap_content" |
136 android:layout_height="wrap_content" /> | 118 android:layout_height="wrap_content" /> |
137 | 119 |
138 </LinearLayout> | 120 </LinearLayout> |
139 | 121 |
140 <LinearLayout | 122 <LinearLayout |
141 android:layout_width="match_parent" | 123 android:layout_width="match_parent" |
142 android:paddingTop="@dimen/view_vertical_margin" | 124 android:paddingTop="@dimen/view_vertical_margin" |
| 125 android:minHeight="@dimen/view_height" |
143 android:layout_height="wrap_content"> | 126 android:layout_height="wrap_content"> |
144 | 127 |
145 <TextView | 128 <TextView |
146 android:layout_width="0dp" | 129 android:layout_width="0dp" |
147 android:layout_height="wrap_content" | 130 android:layout_height="wrap_content" |
148 android:layout_weight="1" | 131 android:layout_weight="1" |
149 android:textSize="@dimen/abc_text_size_medium_material" | 132 android:textSize="@dimen/abc_text_size_medium_material" |
150 android:text="@string/label_auto_hide_appbar"/> | 133 android:text="@string/label_auto_hide_appbar"/> |
151 | 134 |
152 <CheckBox | 135 <CheckBox |
153 android:id="@+id/auto_hide_checkbox" | 136 android:id="@+id/auto_hide_checkbox" |
154 android:layout_width="wrap_content" | 137 android:layout_width="wrap_content" |
155 android:layout_height="wrap_content" /> | 138 android:layout_height="wrap_content" /> |
156 | 139 |
157 </LinearLayout> | 140 </LinearLayout> |
158 | 141 |
159 <Button | 142 <Button |
| 143 android:id="@+id/advanced_ui_setting" |
| 144 android:layout_gravity="center_horizontal" |
| 145 android:paddingTop="@dimen/button_padding_top" |
| 146 android:layout_width="@dimen/button_width" |
| 147 android:layout_height="@dimen/button_height" |
| 148 android:textSize="@dimen/abc_text_size_medium_material" |
| 149 android:text="@string/label_advanced_ui_setting" /> |
| 150 |
| 151 <Button |
160 android:id="@+id/start_custom_tab" | 152 android:id="@+id/start_custom_tab" |
161 android:layout_gravity="center_horizontal" | 153 android:layout_gravity="center_horizontal" |
162 android:layout_width="wrap_content" | 154 android:paddingTop="@dimen/button_padding_top" |
163 android:layout_height="wrap_content" | 155 android:layout_width="@dimen/button_width" |
| 156 android:layout_height="@dimen/button_height" |
| 157 android:textSize="@dimen/abc_text_size_medium_material" |
164 android:text="@string/label_start_custom_tab" /> | 158 android:text="@string/label_start_custom_tab" /> |
165 | 159 |
166 </LinearLayout> | 160 </LinearLayout> |
OLD | NEW |