Merge lp:~fboucault/camera-app/timer_disable_camera into lp:camera-app/staging
Proposed by
Florian Boucault
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ugo Riboni | ||||
Approved revision: | 661 | ||||
Merged at revision: | 663 | ||||
Proposed branch: | lp:~fboucault/camera-app/timer_disable_camera | ||||
Merge into: | lp:camera-app/staging | ||||
Diff against target: |
197 lines (+75/-7) 5 files modified
ViewFinderOverlay.qml (+11/-6) ViewFinderView.qml (+1/-0) camera-app.qml (+3/-1) tests/autopilot/camera_app/emulators/main_window.py (+4/-0) tests/autopilot/camera_app/tests/test_capture.py (+56/-0) |
||||
To merge this branch: | bzr merge lp:~fboucault/camera-app/timer_disable_camera | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ugo Riboni (community) | Needs Fixing | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+288304@code.launchpad.net |
Commit message
Disable controls and prevent navigation while a delayed/timed shoot is ongoing.
To post a comment you must log in.
FAILED: Continuous integration, rev:661 jenkins. qa.ubuntu. com/job/ camera- app-staging- ci/49/ jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-amd64- ci/49 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-amd64- ci/49/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-armhf- ci/49 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-armhf- ci/49/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-i386- ci/49 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-i386- ci/49/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/426 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- touch/1096 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 1026 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 27985
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-staging- ci/49/rebuild
http://