Merge lp://staging/~uriboni/camera-app/zoom-level-tests into lp://staging/camera-app

Proposed by Ugo Riboni
Status: Superseded
Proposed branch: lp://staging/~uriboni/camera-app/zoom-level-tests
Merge into: lp://staging/camera-app
Diff against target: 737 lines (+298/-110)
12 files modified
CameraApp/advancedcamerasettings.cpp (+15/-11)
CameraApp/advancedcamerasettings.h (+1/-0)
SlideshowView.qml (+1/-1)
VideoReview.qml (+63/-0)
ViewFinderExportConfirmation.qml (+66/-49)
ViewFinderOverlay.qml (+68/-9)
ViewFinderOverlayLoader.qml (+4/-0)
ViewFinderView.qml (+63/-32)
ZoomControl.qml (+1/-1)
camera-app.qml (+12/-5)
camera-contenthub.json (+2/-1)
tests/autopilot/camera_app/tests/test_zoom.py (+2/-1)
To merge this branch: bzr merge lp://staging/~uriboni/camera-app/zoom-level-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+282201@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-01-11.

Description of the change

Fix zoom related AP tests from previous commit

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches