Merge lp:~jindallo/nearby-scope/convergence-ui-support into lp:nearby-scope
- convergence-ui-support
- Merge into trunk
Proposed by
Jin
Status: | Merged |
---|---|
Approved by: | Jin |
Approved revision: | 100 |
Merged at revision: | 102 |
Proposed branch: | lp:~jindallo/nearby-scope/convergence-ui-support |
Merge into: | lp:nearby-scope |
Diff against target: |
257 lines (+28/-28) (has conflicts) 1 file modified
click-src/aggregator/child_scopes.json (+28/-28) Contents conflict in click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so |
To merge this branch: | bzr merge lp:~jindallo/nearby-scope/convergence-ui-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kyle Nitzsche (community) | Approve | ||
NearBy Scope Team | Pending | ||
Review via email: mp+299778@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Kyle Nitzsche (knitzsche) wrote : | # |
Revision history for this message
Kyle Nitzsche (knitzsche) wrote : | # |
Hi Jin,
The general approach we discussed is to:
* use high cardinalities to ensure their are enough results to fill in the rows
* limit vertical space in different layouts with collapsed-rows
It seems that this often takes a different approach:
* set collapsed-rows to 0 (which IIRC means show them all without limit)
* limit the number of results with cardinality
Is there a reason you did it this way? Or would you consider doing it the way we discussed?
cheers
Revision history for this message
Jin (jindallo) wrote : | # |
Hello Kyle,
I used the way we discussed/agreed to implement this patch,
which means:
1. set collapsed-rows to 0 -> 1
2. set cardinality to big enough -> 10
Please kindly have a look on below diff,
it followed the approach we discussed.
Many thanks!
Revision history for this message
Kyle Nitzsche (knitzsche) wrote : | # |
Looks good Jin. Thanks.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'click-src/aggregator/child_scopes.json' | |||
2 | --- click-src/aggregator/child_scopes.json 2015-12-24 05:43:05 +0000 | |||
3 | +++ click-src/aggregator/child_scopes.json 2016-07-19 01:18:48 +0000 | |||
4 | @@ -14,7 +14,7 @@ | |||
5 | 14 | "card-layout": "vertical", | 14 | "card-layout": "vertical", |
6 | 15 | "card-size": "medium", | 15 | "card-size": "medium", |
7 | 16 | "category-layout": "grid", | 16 | "category-layout": "grid", |
9 | 17 | "collapsed-rows": 0 | 17 | "collapsed-rows": 1 |
10 | 18 | } | 18 | } |
11 | 19 | } | 19 | } |
12 | 20 | }, | 20 | }, |
13 | @@ -29,7 +29,7 @@ | |||
14 | 29 | "template": { | 29 | "template": { |
15 | 30 | "card-size": "small", | 30 | "card-size": "small", |
16 | 31 | "category-layout": "grid", | 31 | "category-layout": "grid", |
18 | 32 | "collapsed-rows": 0 | 32 | "collapsed-rows": 1 |
19 | 33 | } | 33 | } |
20 | 34 | } | 34 | } |
21 | 35 | }, | 35 | }, |
22 | @@ -44,7 +44,7 @@ | |||
23 | 44 | "template": { | 44 | "template": { |
24 | 45 | "card-size": "small", | 45 | "card-size": "small", |
25 | 46 | "category-layout": "grid", | 46 | "category-layout": "grid", |
27 | 47 | "collapsed-rows": 0 | 47 | "collapsed-rows": 1 |
28 | 48 | } | 48 | } |
29 | 49 | } | 49 | } |
30 | 50 | }, | 50 | }, |
31 | @@ -91,7 +91,7 @@ | |||
32 | 91 | "template": { | 91 | "template": { |
33 | 92 | "card-size": "small", | 92 | "card-size": "small", |
34 | 93 | "category-layout": "grid", | 93 | "category-layout": "grid", |
36 | 94 | "collapsed-rows": 0 | 94 | "collapsed-rows": 1 |
37 | 95 | } | 95 | } |
38 | 96 | } | 96 | } |
39 | 97 | }, | 97 | }, |
40 | @@ -108,7 +108,7 @@ | |||
41 | 108 | "template": { | 108 | "template": { |
42 | 109 | "card-size": "small", | 109 | "card-size": "small", |
43 | 110 | "category-layout": "grid", | 110 | "category-layout": "grid", |
45 | 111 | "collapsed-rows": 0 | 111 | "collapsed-rows": 1 |
46 | 112 | } | 112 | } |
47 | 113 | } | 113 | } |
48 | 114 | }, | 114 | }, |
49 | @@ -174,7 +174,7 @@ | |||
50 | 174 | "template": { | 174 | "template": { |
51 | 175 | "card-size": "small", | 175 | "card-size": "small", |
52 | 176 | "category-layout": "grid", | 176 | "category-layout": "grid", |
54 | 177 | "collapsed-rows": 0 | 177 | "collapsed-rows": 1 |
55 | 178 | } | 178 | } |
56 | 179 | } | 179 | } |
57 | 180 | } | 180 | } |
58 | @@ -230,7 +230,7 @@ | |||
59 | 230 | "scope": { | 230 | "scope": { |
60 | 231 | "_category_title": "Weather from The Weather Channel", | 231 | "_category_title": "Weather from The Weather Channel", |
61 | 232 | "department": "dept-how", | 232 | "department": "dept-how", |
63 | 233 | "cardinality": 3, | 233 | "cardinality": 10, |
64 | 234 | "id": "com.canonical.scopes.weatherchannel", | 234 | "id": "com.canonical.scopes.weatherchannel", |
65 | 235 | "link_to_child": "true", | 235 | "link_to_child": "true", |
66 | 236 | "local_id": "twc1", | 236 | "local_id": "twc1", |
67 | @@ -252,7 +252,7 @@ | |||
68 | 252 | { | 252 | { |
69 | 253 | "scope": { | 253 | "scope": { |
70 | 254 | "_category_title": "Landmarks around you from Yelp", | 254 | "_category_title": "Landmarks around you from Yelp", |
72 | 255 | "cardinality": 6, | 255 | "cardinality": 10, |
73 | 256 | "child_department": "landmarks", | 256 | "child_department": "landmarks", |
74 | 257 | "department": "dept-how", | 257 | "department": "dept-how", |
75 | 258 | "id": "com.canonical.scopes.yelp_yelp", | 258 | "id": "com.canonical.scopes.yelp_yelp", |
76 | @@ -264,7 +264,7 @@ | |||
77 | 264 | { | 264 | { |
78 | 265 | "scope": { | 265 | "scope": { |
79 | 266 | "_category_title": "Closest from Yelp", | 266 | "_category_title": "Closest from Yelp", |
81 | 267 | "cardinality": 4, | 267 | "cardinality": 10, |
82 | 268 | "department": "dept-how", | 268 | "department": "dept-how", |
83 | 269 | "id": "com.canonical.scopes.yelp_yelp", | 269 | "id": "com.canonical.scopes.yelp_yelp", |
84 | 270 | "link_to_child": "true", | 270 | "link_to_child": "true", |
85 | @@ -281,7 +281,7 @@ | |||
86 | 281 | { | 281 | { |
87 | 282 | "scope": { | 282 | "scope": { |
88 | 283 | "_category_title": "NearBy from Flickr", | 283 | "_category_title": "NearBy from Flickr", |
90 | 284 | "cardinality": 9, | 284 | "cardinality": 10, |
91 | 285 | "department": "dept-how", | 285 | "department": "dept-how", |
92 | 286 | "id": "com.canonical.scopes.flickr_nearby", | 286 | "id": "com.canonical.scopes.flickr_nearby", |
93 | 287 | "link_to_child": "true", | 287 | "link_to_child": "true", |
94 | @@ -330,7 +330,7 @@ | |||
95 | 330 | { | 330 | { |
96 | 331 | "scope": { | 331 | "scope": { |
97 | 332 | "_category_title": "Weather from The Weather Channel", | 332 | "_category_title": "Weather from The Weather Channel", |
99 | 333 | "cardinality": 3, | 333 | "cardinality": 10, |
100 | 334 | "department": "dept-bored", | 334 | "department": "dept-bored", |
101 | 335 | "id": "com.canonical.scopes.weatherchannel", | 335 | "id": "com.canonical.scopes.weatherchannel", |
102 | 336 | "link_to_child": "true", | 336 | "link_to_child": "true", |
103 | @@ -353,7 +353,7 @@ | |||
104 | 353 | { | 353 | { |
105 | 354 | "scope": { | 354 | "scope": { |
106 | 355 | "_category_title": "Landmarks around you from Yelp", | 355 | "_category_title": "Landmarks around you from Yelp", |
108 | 356 | "cardinality": 6, | 356 | "cardinality": 10, |
109 | 357 | "child_department": "landmarks", | 357 | "child_department": "landmarks", |
110 | 358 | "department": "dept-bored", | 358 | "department": "dept-bored", |
111 | 359 | "id": "com.canonical.scopes.yelp_yelp", | 359 | "id": "com.canonical.scopes.yelp_yelp", |
112 | @@ -365,7 +365,7 @@ | |||
113 | 365 | { | 365 | { |
114 | 366 | "scope": { | 366 | "scope": { |
115 | 367 | "_category_title": "Closest from Yelp", | 367 | "_category_title": "Closest from Yelp", |
117 | 368 | "cardinality": 4, | 368 | "cardinality": 10, |
118 | 369 | "department": "dept-bored", | 369 | "department": "dept-bored", |
119 | 370 | "id": "com.canonical.scopes.yelp_yelp", | 370 | "id": "com.canonical.scopes.yelp_yelp", |
120 | 371 | "link_to_child": "true", | 371 | "link_to_child": "true", |
121 | @@ -382,7 +382,7 @@ | |||
122 | 382 | { | 382 | { |
123 | 383 | "scope": { | 383 | "scope": { |
124 | 384 | "_category_title": "NearBy from Flickr", | 384 | "_category_title": "NearBy from Flickr", |
126 | 385 | "cardinality": 9, | 385 | "cardinality": 10, |
127 | 386 | "department": "dept-bored", | 386 | "department": "dept-bored", |
128 | 387 | "id": "com.canonical.scopes.flickr_nearby", | 387 | "id": "com.canonical.scopes.flickr_nearby", |
129 | 388 | "link_to_child": "true", | 388 | "link_to_child": "true", |
130 | @@ -431,7 +431,7 @@ | |||
131 | 431 | { | 431 | { |
132 | 432 | "scope": { | 432 | "scope": { |
133 | 433 | "_category_title": "Weather from The Weather Channel", | 433 | "_category_title": "Weather from The Weather Channel", |
135 | 434 | "cardinality": 3, | 434 | "cardinality": 10, |
136 | 435 | "department": "dept-onthemove", | 435 | "department": "dept-onthemove", |
137 | 436 | "id": "com.canonical.scopes.weatherchannel", | 436 | "id": "com.canonical.scopes.weatherchannel", |
138 | 437 | "link_to_child": "true", | 437 | "link_to_child": "true", |
139 | @@ -510,14 +510,14 @@ | |||
140 | 510 | "id": "com.canonical.scopes.poi_poi", | 510 | "id": "com.canonical.scopes.poi_poi", |
141 | 511 | "link_to_child": "true", | 511 | "link_to_child": "true", |
142 | 512 | "local_id": "poi-atm", | 512 | "local_id": "poi-atm", |
144 | 513 | "cardinality": 6, | 513 | "cardinality": 10, |
145 | 514 | "renderer_common_id": "point-of-interest" | 514 | "renderer_common_id": "point-of-interest" |
146 | 515 | } | 515 | } |
147 | 516 | }, | 516 | }, |
148 | 517 | { | 517 | { |
149 | 518 | "scope": { | 518 | "scope": { |
150 | 519 | "_category_title": "Traffic cameras around you", | 519 | "_category_title": "Traffic cameras around you", |
152 | 520 | "cardinality": 3, | 520 | "cardinality": 10, |
153 | 521 | "child_department": "Cameras", | 521 | "child_department": "Cameras", |
154 | 522 | "department": "dept-onthemove", | 522 | "department": "dept-onthemove", |
155 | 523 | "id": "com.canonical.scopes.inrix_inrix", | 523 | "id": "com.canonical.scopes.inrix_inrix", |
156 | @@ -534,7 +534,7 @@ | |||
157 | 534 | "template": { | 534 | "template": { |
158 | 535 | "card-size": "small", | 535 | "card-size": "small", |
159 | 536 | "category-layout": "grid", | 536 | "category-layout": "grid", |
161 | 537 | "collapsed-rows": 0 | 537 | "collapsed-rows": 1 |
162 | 538 | } | 538 | } |
163 | 539 | } | 539 | } |
164 | 540 | } | 540 | } |
165 | @@ -579,7 +579,7 @@ | |||
166 | 579 | { | 579 | { |
167 | 580 | "scope": { | 580 | "scope": { |
168 | 581 | "_category_title": "ATMs near you", | 581 | "_category_title": "ATMs near you", |
170 | 582 | "cardinality": 3, | 582 | "cardinality": 10, |
171 | 583 | "child_department": "atm", | 583 | "child_department": "atm", |
172 | 584 | "department": "dept-hungry", | 584 | "department": "dept-hungry", |
173 | 585 | "id": "com.canonical.scopes.poi_poi", | 585 | "id": "com.canonical.scopes.poi_poi", |
174 | @@ -610,7 +610,7 @@ | |||
175 | 610 | { | 610 | { |
176 | 611 | "scope": { | 611 | "scope": { |
177 | 612 | "_category_title": "Bars from Yelp", | 612 | "_category_title": "Bars from Yelp", |
179 | 613 | "cardinality": 4, | 613 | "cardinality": 10, |
180 | 614 | "child_department": "bars", | 614 | "child_department": "bars", |
181 | 615 | "department": "dept-thirsty", | 615 | "department": "dept-thirsty", |
182 | 616 | "id": "com.canonical.scopes.yelp_yelp", | 616 | "id": "com.canonical.scopes.yelp_yelp", |
183 | @@ -628,7 +628,7 @@ | |||
184 | 628 | { | 628 | { |
185 | 629 | "scope": { | 629 | "scope": { |
186 | 630 | "_category_title": "Coffee and Tea from Yelp", | 630 | "_category_title": "Coffee and Tea from Yelp", |
188 | 631 | "cardinality": 4, | 631 | "cardinality": 10, |
189 | 632 | "child_department": "coffee", | 632 | "child_department": "coffee", |
190 | 633 | "department": "dept-thirsty", | 633 | "department": "dept-thirsty", |
191 | 634 | "id": "com.canonical.scopes.yelp_yelp", | 634 | "id": "com.canonical.scopes.yelp_yelp", |
192 | @@ -646,7 +646,7 @@ | |||
193 | 646 | { | 646 | { |
194 | 647 | "scope": { | 647 | "scope": { |
195 | 648 | "_category_title": "ATMs near you", | 648 | "_category_title": "ATMs near you", |
197 | 649 | "cardinality": 3, | 649 | "cardinality": 10, |
198 | 650 | "child_department": "atm", | 650 | "child_department": "atm", |
199 | 651 | "department": "dept-thirsty", | 651 | "department": "dept-thirsty", |
200 | 652 | "id": "com.canonical.scopes.poi_poi", | 652 | "id": "com.canonical.scopes.poi_poi", |
201 | @@ -665,7 +665,7 @@ | |||
202 | 665 | { | 665 | { |
203 | 666 | "scope": { | 666 | "scope": { |
204 | 667 | "_category_title": "Weather from The Weather Channel", | 667 | "_category_title": "Weather from The Weather Channel", |
206 | 668 | "cardinality": 3, | 668 | "cardinality": 10, |
207 | 669 | "department": "dept-stressed", | 669 | "department": "dept-stressed", |
208 | 670 | "id": "com.canonical.scopes.weatherchannel", | 670 | "id": "com.canonical.scopes.weatherchannel", |
209 | 671 | "link_to_child": "true", | 671 | "link_to_child": "true", |
210 | @@ -688,7 +688,7 @@ | |||
211 | 688 | { | 688 | { |
212 | 689 | "scope": { | 689 | "scope": { |
213 | 690 | "_category_title": "Spas from Yelp", | 690 | "_category_title": "Spas from Yelp", |
215 | 691 | "cardinality": 4, | 691 | "cardinality": 10, |
216 | 692 | "child_department": "beautysvc", | 692 | "child_department": "beautysvc", |
217 | 693 | "department": "dept-stressed", | 693 | "department": "dept-stressed", |
218 | 694 | "id": "com.canonical.scopes.yelp_yelp", | 694 | "id": "com.canonical.scopes.yelp_yelp", |
219 | @@ -706,7 +706,7 @@ | |||
220 | 706 | { | 706 | { |
221 | 707 | "scope": { | 707 | "scope": { |
222 | 708 | "_category_title": "Fashion from Yelp", | 708 | "_category_title": "Fashion from Yelp", |
224 | 709 | "cardinality": 4, | 709 | "cardinality": 10, |
225 | 710 | "child_department": "fashion", | 710 | "child_department": "fashion", |
226 | 711 | "department": "dept-stressed", | 711 | "department": "dept-stressed", |
227 | 712 | "id": "com.canonical.scopes.yelp_yelp", | 712 | "id": "com.canonical.scopes.yelp_yelp", |
228 | @@ -724,7 +724,7 @@ | |||
229 | 724 | { | 724 | { |
230 | 725 | "scope": { | 725 | "scope": { |
231 | 726 | "_category_title": "ATMs near you", | 726 | "_category_title": "ATMs near you", |
233 | 727 | "cardinality": 3, | 727 | "cardinality": 10, |
234 | 728 | "child_department": "atm", | 728 | "child_department": "atm", |
235 | 729 | "department": "dept-stressed", | 729 | "department": "dept-stressed", |
236 | 730 | "id": "com.canonical.scopes.poi_poi", | 730 | "id": "com.canonical.scopes.poi_poi", |
237 | @@ -736,7 +736,7 @@ | |||
238 | 736 | { | 736 | { |
239 | 737 | "scope": { | 737 | "scope": { |
240 | 738 | "_category_title": "Games to let off some steam", | 738 | "_category_title": "Games to let off some steam", |
242 | 739 | "cardinality": 3, | 739 | "cardinality": 10, |
243 | 740 | "child_department": "games", | 740 | "child_department": "games", |
244 | 741 | "department": "dept-stressed", | 741 | "department": "dept-stressed", |
245 | 742 | "id": "com.canonical.scopes.clickstore", | 742 | "id": "com.canonical.scopes.clickstore", |
246 | @@ -748,7 +748,7 @@ | |||
247 | 748 | { | 748 | { |
248 | 749 | "scope": { | 749 | "scope": { |
249 | 750 | "_category_title": "Relax with some music", | 750 | "_category_title": "Relax with some music", |
251 | 751 | "cardinality": 3, | 751 | "cardinality": 10, |
252 | 752 | "child_department": "genre-ambient", | 752 | "child_department": "genre-ambient", |
253 | 753 | "department": "dept-stressed", | 753 | "department": "dept-stressed", |
254 | 754 | "id": "com.canonical.scopes.sevendigital", | 754 | "id": "com.canonical.scopes.sevendigital", |
255 | 755 | 755 | ||
256 | === renamed file 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so' => 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER' (properties changed: +x to -x) | |||
257 | 756 | Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so 2016-07-13 15:33:23 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER 2016-07-19 01:18:48 +0000 differ | 756 | Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so 2016-07-13 15:33:23 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER 2016-07-19 01:18:48 +0000 differ |
Hi Jin,
I assume you tested:
* in a fake location (like London) that has full results
* on tablet landscape & portrait
* on something small (like krillin)