camera-app

Merge lp://staging/~fboucault/camera-app/fullscreen_staged_only into lp://staging/camera-app/staging

  1. fullscreen_staged_only
  2. Merge into staging
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 646
Merged at revision: 642
Proposed branch: lp://staging/~fboucault/camera-app/fullscreen_staged_only
Merge into: lp://staging/camera-app/staging
Diff against target: 204 lines (+46/-16)
7 files modified
GalleryView.qml (+2/-0)
PhotogridView.qml (+1/-1)
SlideshowView.qml (+3/-5)
ViewFinderOverlay.qml (+3/-3)
ViewFinderOverlayLoader.qml (+3/-1)
ViewFinderView.qml (+2/-1)
camera-app.qml (+32/-5)
To merge this branch: bzr merge lp://staging/~fboucault/camera-app/fullscreen_staged_only
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+284146@code.staging.launchpad.net

Commit message

Only use full screen in staged mode.

Description of the change

Only use full screen in staged mode.

Cannot land until work in MIR/Unity8 to support Qt.MaximizeUsingFullscreenGeometryHint is complete.

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

FAILED: Continuous integration, rev:641
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/20/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/383
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/937
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27080

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/20/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:642
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/23/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/386
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/941
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27110

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/23/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:644
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/26/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/391
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1061
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/949
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27164

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/26/rebuild

review: Needs Fixing (continuous-integration)

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