Merge lp:~fboucault/camera-app/empty_photo_roll into lp:camera-app
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Approved by: | Florian Boucault |
Approved revision: | 406 |
Merged at revision: | 410 |
Proposed branch: | lp:~fboucault/camera-app/empty_photo_roll |
Merge into: | lp:camera-app |
Prerequisite: | lp:~fboucault/camera-app/photo_roll_hint |
Diff against target: |
192 lines (+80/-4) 5 files modified
CameraApp/foldersmodel.cpp (+7/-0) CameraApp/foldersmodel.h (+3/-0) GalleryView.qml (+32/-4) tests/autopilot/camera_app/emulators/main_window.py (+4/-0) tests/autopilot/camera_app/tests/test_gallery_view.py (+34/-0) |
To merge this branch: | bzr merge lp:~fboucault/camera-app/empty_photo_roll |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Pending | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+239915@code.launchpad.net |
This proposal supersedes a proposal from 2014-10-10.
Commit message
Display message when no media present in photo roll.
To post a comment you must log in.
FAILED: Continuous integration, rev:404 jenkins. qa.ubuntu. com/job/ camera- app-ci/ 298/ jenkins. qa.ubuntu. com/job/ camera- app-utopic- amd64-ci/ 114 jenkins. qa.ubuntu. com/job/ camera- app-utopic- armhf-ci/ 114 jenkins. qa.ubuntu. com/job/ camera- app-utopic- armhf-ci/ 114/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-utopic- i386-ci/ 114 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -utopic- touch/480 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 4045 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/623 jenkins. qa.ubuntu. com/job/ generic- click-builder- utopic- armhf/792 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 14515 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 3411 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4374 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4374/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-ci/ 298/rebuild
http://