Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: demos/src/main/res/layout/activity_custom_ui.xml

Issue 1750963002: Update demo with features from support lib 23.2.0 (Closed) Base URL: https://chromium.googlesource.com/external/github.com/GoogleChrome/custom-tabs-client@master
Patch Set: Fix comment on decoding Bitmpa on UI thread Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « demos/src/main/java/org/chromium/customtabsdemos/ShareBroadcastReceiver.java ('k') | demos/src/main/res/layout/activity_main.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 distributed under the License is distributed on an "AS IS" BASIS, 11 distributed under the License is distributed on an "AS IS" BASIS,
12 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 12 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 See the License for the specific language governing permissions and 13 See the License for the specific language governing permissions and
14 limitations under the License. 14 limitations under the License.
15 --> 15 -->
16 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 16 <ScrollView
17 xmlns:android="http://schemas.android.com/apk/res/android"
17 xmlns:app="http://schemas.android.com/apk/res-auto" 18 xmlns:app="http://schemas.android.com/apk/res-auto"
18 xmlns:tools="http://schemas.android.com/tools" 19 xmlns:tools="http://schemas.android.com/tools"
19 android:layout_width="match_parent" 20 android:layout_width="match_parent"
20 android:layout_height="match_parent" 21 android:layout_height="match_parent">
21 android:paddingLeft="@dimen/activity_horizontal_margin"
22 android:paddingRight="@dimen/activity_horizontal_margin"
23 android:paddingTop="@dimen/activity_vertical_margin"
24 android:paddingBottom="@dimen/activity_vertical_margin"
25 android:orientation="vertical"
26 tools:context=".CustomUIActivity">
27
28 <TextView
29 android:layout_width="match_parent"
30 android:textSize="@dimen/abc_text_size_medium_material"
31 android:layout_height="wrap_content"
32 android:text="@string/label_url" />
33
34 <EditText
35 android:id="@+id/url"
36 android:text="@string/default_test_url"
37 android:layout_width="match_parent"
38 android:layout_height="wrap_content"
39 android:inputType="textUri" />
40
41 <LinearLayout 22 <LinearLayout
42 android:layout_width="match_parent" 23 android:layout_width="match_parent"
43 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
44 android:paddingTop="@dimen/view_vertical_margin" 25 android:paddingLeft="@dimen/activity_horizontal_margin"
45 android:orientation="vertical"> 26 android:paddingRight="@dimen/activity_horizontal_margin"
27 android:paddingTop="@dimen/activity_vertical_margin"
28 android:paddingBottom="@dimen/activity_vertical_margin"
29 android:orientation="vertical"
30 tools:context=".CustomUIActivity">
46 31
47 <TextView 32 <TextView
33 android:layout_width="match_parent"
34 android:textSize="@dimen/abc_text_size_medium_material"
35 android:layout_height="wrap_content"
36 android:text="@string/label_url" />
37
38 <EditText
39 android:id="@+id/url"
40 android:text="@string/default_test_url"
41 android:layout_width="match_parent"
42 android:layout_height="wrap_content"
43 android:inputType="textUri" />
44
45 <LinearLayout
46 android:layout_width="match_parent"
47 android:layout_height="wrap_content"
48 android:paddingTop="@dimen/view_vertical_margin"
49 android:orientation="vertical">
50
51 <TextView
52 android:layout_width="wrap_content"
53 android:layout_height="wrap_content"
54 android:textSize="@dimen/abc_text_size_medium_material"
55 android:text="@string/label_toobar_color"/>
56
57 <EditText
58 android:id="@+id/custom_toolbar_color"
59 android:layout_width="match_parent"
60 android:layout_height="wrap_content"
61 android:singleLine="true"
62 android:hint="@string/default_toolbar_color"
63 android:text="@string/default_toolbar_color"/>
64
65 </LinearLayout>
66
67 <LinearLayout
68 android:layout_width="match_parent"
69 android:layout_height="wrap_content"
70 android:paddingTop="@dimen/view_vertical_margin"
71 android:orientation="vertical">
72
73 <TextView
74 android:layout_width="wrap_content"
75 android:layout_height="wrap_content"
76 android:textSize="@dimen/abc_text_size_medium_material"
77 android:text="@string/label_toobar_secondary_color"/>
78
79 <EditText
80 android:id="@+id/custom_toolbar_secondary_color"
81 android:layout_width="match_parent"
82 android:layout_height="wrap_content"
83 android:singleLine="true"
84 android:hint="@string/default_toolbar_color"
85 android:text="@string/default_toolbar_color"/>
86
87 </LinearLayout>
88
89 <LinearLayout
90 android:layout_width="match_parent"
91 android:paddingTop="@dimen/view_vertical_margin"
92 android:orientation="horizontal"
93 android:layout_height="wrap_content">
94
95 <TextView
96 android:layout_width="0dp"
97 android:layout_height="wrap_content"
98 android:layout_weight="1"
99 android:textSize="@dimen/abc_text_size_medium_material"
100 android:text="@string/label_add_action_button"/>
101
102 <CheckBox
103 android:id="@+id/custom_show_action_button"
104 android:layout_width="wrap_content"
105 android:layout_height="wrap_content" />
106
107 </LinearLayout>
108
109 <LinearLayout
110 android:layout_width="match_parent"
111 android:paddingTop="@dimen/view_vertical_margin"
112 android:layout_height="wrap_content">
113
114 <TextView
115 android:layout_width="0dp"
116 android:layout_height="wrap_content"
117 android:layout_weight="1"
118 android:textSize="@dimen/abc_text_size_medium_material"
119 android:text="@string/label_add_menus"/>
120
121 <CheckBox
122 android:id="@+id/custom_add_menus"
123 android:layout_width="wrap_content"
124 android:layout_height="wrap_content" />
125
126 </LinearLayout>
127
128 <LinearLayout
129 android:layout_width="match_parent"
130 android:paddingTop="@dimen/view_vertical_margin"
131 android:layout_height="wrap_content">
132
133 <TextView
134 android:layout_width="0dp"
135 android:layout_height="wrap_content"
136 android:layout_weight="1"
137 android:textSize="@dimen/abc_text_size_medium_material"
138 android:text="@string/label_add_default_share"/>
139
140 <CheckBox
141 android:id="@+id/add_default_share"
142 android:layout_width="wrap_content"
143 android:layout_height="wrap_content" />
144
145 </LinearLayout>
146
147 <LinearLayout
148 android:layout_width="match_parent"
149 android:paddingTop="@dimen/view_vertical_margin"
150 android:layout_height="wrap_content">
151
152 <TextView
153 android:layout_width="0dp"
154 android:layout_height="wrap_content"
155 android:layout_weight="1"
156 android:textSize="@dimen/abc_text_size_medium_material"
157 android:text="@string/label_add_toolbar_item"/>
158
159 <CheckBox
160 android:id="@+id/add_toolbar_item"
161 android:layout_width="wrap_content"
162 android:layout_height="wrap_content" />
163
164 </LinearLayout>
165
166 <LinearLayout
167 android:layout_width="match_parent"
168 android:paddingTop="@dimen/view_vertical_margin"
169 android:layout_height="wrap_content">
170
171 <TextView
172 android:layout_width="0dp"
173 android:layout_height="wrap_content"
174 android:layout_weight="1"
175 android:textSize="@dimen/abc_text_size_medium_material"
176 android:text="@string/label_show_title"/>
177
178 <CheckBox
179 android:id="@+id/show_title"
180 android:layout_width="wrap_content"
181 android:layout_height="wrap_content" />
182
183 </LinearLayout>
184
185 <LinearLayout
186 android:layout_width="match_parent"
187 android:paddingTop="@dimen/view_vertical_margin"
188 android:layout_height="wrap_content">
189
190 <TextView
191 android:layout_width="0dp"
192 android:layout_height="wrap_content"
193 android:layout_weight="1"
194 android:textSize="@dimen/abc_text_size_medium_material"
195 android:text="@string/label_custom_back_button"/>
196
197 <CheckBox
198 android:id="@+id/custom_back_button"
199 android:layout_width="wrap_content"
200 android:layout_height="wrap_content" />
201
202 </LinearLayout>
203
204 <LinearLayout
205 android:layout_width="match_parent"
206 android:paddingTop="@dimen/view_vertical_margin"
207 android:layout_height="wrap_content">
208
209 <TextView
210 android:layout_width="0dp"
211 android:layout_height="wrap_content"
212 android:layout_weight="1"
213 android:textSize="@dimen/abc_text_size_medium_material"
214 android:text="@string/label_auto_hide_appbar"/>
215
216 <CheckBox
217 android:id="@+id/auto_hide_checkbox"
218 android:layout_width="wrap_content"
219 android:layout_height="wrap_content" />
220
221 </LinearLayout>
222
223 <Button
224 android:id="@+id/start_custom_tab"
225 android:layout_gravity="center_horizontal"
48 android:layout_width="wrap_content" 226 android:layout_width="wrap_content"
49 android:layout_height="wrap_content" 227 android:layout_height="wrap_content"
50 android:textSize="@dimen/abc_text_size_medium_material" 228 android:text="@string/label_start_custom_tab" />
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 229
61 </LinearLayout> 230 </LinearLayout>
62 231 </ScrollView>
63 <LinearLayout
64 android:layout_width="match_parent"
65 android:paddingTop="@dimen/view_vertical_margin"
66 android:orientation="horizontal"
67 android:layout_height="wrap_content">
68
69 <TextView
70 android:layout_width="0dp"
71 android:layout_height="wrap_content"
72 android:layout_weight="1"
73 android:textSize="@dimen/abc_text_size_medium_material"
74 android:text="@string/label_add_action_button"/>
75
76 <CheckBox
77 android:id="@+id/custom_show_action_button"
78 android:layout_width="wrap_content"
79 android:layout_height="wrap_content" />
80
81 </LinearLayout>
82
83 <LinearLayout
84 android:layout_width="match_parent"
85 android:paddingTop="@dimen/view_vertical_margin"
86 android:layout_height="wrap_content">
87
88 <TextView
89 android:layout_width="0dp"
90 android:layout_height="wrap_content"
91 android:layout_weight="1"
92 android:textSize="@dimen/abc_text_size_medium_material"
93 android:text="@string/label_add_menus"/>
94
95 <CheckBox
96 android:id="@+id/custom_add_menus"
97 android:layout_width="wrap_content"
98 android:layout_height="wrap_content" />
99
100 </LinearLayout>
101
102 <LinearLayout
103 android:layout_width="match_parent"
104 android:paddingTop="@dimen/view_vertical_margin"
105 android:layout_height="wrap_content">
106
107 <TextView
108 android:layout_width="0dp"
109 android:layout_height="wrap_content"
110 android:layout_weight="1"
111 android:textSize="@dimen/abc_text_size_medium_material"
112 android:text="@string/label_show_title"/>
113
114 <CheckBox
115 android:id="@+id/show_title"
116 android:layout_width="wrap_content"
117 android:layout_height="wrap_content" />
118
119 </LinearLayout>
120
121 <LinearLayout
122 android:layout_width="match_parent"
123 android:paddingTop="@dimen/view_vertical_margin"
124 android:layout_height="wrap_content">
125
126 <TextView
127 android:layout_width="0dp"
128 android:layout_height="wrap_content"
129 android:layout_weight="1"
130 android:textSize="@dimen/abc_text_size_medium_material"
131 android:text="@string/label_custom_back_button"/>
132
133 <CheckBox
134 android:id="@+id/custom_back_button"
135 android:layout_width="wrap_content"
136 android:layout_height="wrap_content" />
137
138 </LinearLayout>
139
140 <LinearLayout
141 android:layout_width="match_parent"
142 android:paddingTop="@dimen/view_vertical_margin"
143 android:layout_height="wrap_content">
144
145 <TextView
146 android:layout_width="0dp"
147 android:layout_height="wrap_content"
148 android:layout_weight="1"
149 android:textSize="@dimen/abc_text_size_medium_material"
150 android:text="@string/label_auto_hide_appbar"/>
151
152 <CheckBox
153 android:id="@+id/auto_hide_checkbox"
154 android:layout_width="wrap_content"
155 android:layout_height="wrap_content" />
156
157 </LinearLayout>
158
159 <Button
160 android:id="@+id/start_custom_tab"
161 android:layout_gravity="center_horizontal"
162 android:layout_width="wrap_content"
163 android:layout_height="wrap_content"
164 android:text="@string/label_start_custom_tab" />
165
166 </LinearLayout>
OLDNEW
« no previous file with comments | « demos/src/main/java/org/chromium/customtabsdemos/ShareBroadcastReceiver.java ('k') | demos/src/main/res/layout/activity_main.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698