Merge lp://staging/~uriboni/camera-app/reset-zoom-ui into lp://staging/camera-app/staging
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Approved by: | Florian Boucault |
Approved revision: | 603 |
Merged at revision: | 609 |
Proposed branch: | lp://staging/~uriboni/camera-app/reset-zoom-ui |
Merge into: | lp://staging/camera-app/staging |
Diff against target: |
204 lines (+80/-28) 4 files modified
ViewFinderOverlay.qml (+7/-0) tests/autopilot/camera_app/emulators/main_window.py (+20/-1) tests/autopilot/camera_app/tests/test_capture.py (+6/-27) tests/autopilot/camera_app/tests/test_zoom.py (+47/-0) |
To merge this branch: | bzr merge lp://staging/~uriboni/camera-app/reset-zoom-ui |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Florian Boucault | Pending | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+278612@code.staging.launchpad.net |
This proposal supersedes a proposal from 2015-11-18.
Commit message
Correctly reset the zoom UI when the actual zoom level of the camera resets due to switching cameras or recording modes
Description of the change
Correctly reset the zoom UI when the actual zoom level of the camera resets due to switching cameras or recording modes
To post a comment you must log in.
FAILED: Continuous integration, rev:600 jenkins. qa.ubuntu. com/job/ camera- app-ci/ 455/ jenkins. qa.ubuntu. com/job/ camera- app-vivid- amd64-ci/ 151 jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 151 jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 151/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-vivid- i386-ci/ 151 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/309/ console jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- touch/968/ console jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 809 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 25237
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
ABORTED: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-ci/ 455/rebuild
http://