Merge lp://qastaging/~fboucault/camera-app/convergence_fullscreen_staging into lp://qastaging/camera-app/staging
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Approved by: | Florian Boucault |
Approved revision: | 636 |
Merged at revision: | 685 |
Proposed branch: | lp://qastaging/~fboucault/camera-app/convergence_fullscreen_staging |
Merge into: | lp://qastaging/camera-app/staging |
Diff against target: |
203 lines (+45/-15) 7 files modified
GalleryView.qml (+2/-0) PhotogridView.qml (+1/-1) SlideshowView.qml (+3/-5) ViewFinderOverlay.qml (+3/-3) ViewFinderOverlayLoader.qml (+2/-0) ViewFinderView.qml (+2/-1) camera-app.qml (+32/-5) |
To merge this branch: | bzr merge lp://qastaging/~fboucault/camera-app/convergence_fullscreen_staging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Only use full screen in staged mode.
To post a comment you must log in.
FAILED: Continuous integration, rev:634 jenkins. qa.ubuntu. com/job/ camera- app-staging- ci/38/ jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-amd64- ci/38 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-amd64- ci/38/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-armhf- ci/38 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-armhf- ci/38/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-i386- ci/38 jenkins. qa.ubuntu. com/job/ camera- app-staging- vivid-i386- ci/38/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/413 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- touch/1083 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 1006 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 27826
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/38/rebuild
http://