Merge lp://qastaging/~artmello/gallery-app/gallery-app-fix_1581184 into lp://qastaging/gallery-app
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Florian Boucault | ||||
| Approved revision: | 1317 | ||||
| Merged at revision: | 1315 | ||||
| Proposed branch: | lp://qastaging/~artmello/gallery-app/gallery-app-fix_1581184 | ||||
| Merge into: | lp://qastaging/gallery-app | ||||
| Diff against target: |
159 lines (+52/-4) 6 files modified
rc/qml/PickerScreen.qml (+3/-3) src/core/data-collection.cpp (+5/-0) src/core/data-collection.h (+4/-0) src/core/view-collection.cpp (+27/-0) src/core/view-collection.h (+1/-0) src/event/event-collection.cpp (+12/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-fix_1581184 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Florian Boucault (community) | code | Approve | |
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Fix PickerScreen delay when previewing media files
Fix collections models to work properly with media type filtering when called from content-hub
Description of the change
Fix PickerScreen delay when previewing media files
Fix collections models to work properly with media type filtering when called from content-hub
Click package:
--------------
https:/
Testing
-------
1. Make sure that you have no media files for today event on Events View;
2. Make sure that gallery-app is closed;
3. Open camera-app and take a photo;
4. Create a new message with messaging-app and try to add a photo from gallery-app;
5. Make sure today event is displayed with the photo you just took;
6. Try to preview photo and make sure there is no unusual delay;
7. When returning from preview make sure there is no animation issue;
Try different combinations of steps 4, 5 and 6 (i.e take a video, request a photo and make sure todays event is not displayed)
Functional testing revealed original issue is fixed with no apparent regressions.