camera-app

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

  1. photo_roll_hint
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Bill Filler
Approved revision: 406
Merged at revision: 408
Proposed branch: lp://staging/~fboucault/camera-app/photo_roll_hint
Merge into: lp://staging/camera-app
Diff against target: 384 lines (+174/-24)
8 files modified
PhotoRollHint.qml (+72/-0)
Snapshot.qml (+1/-0)
ViewFinderView.qml (+20/-3)
main.cpp (+3/-0)
po/camera-app.pot (+12/-8)
tests/autopilot/camera_app/emulators/main_window.py (+28/-0)
tests/autopilot/camera_app/tests/test_capture.py (+36/-0)
tests/autopilot/camera_app/tests/test_gallery_view.py (+2/-13)
To merge this branch: bzr merge lp://staging/~fboucault/camera-app/photo_roll_hint
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+237869@code.staging.launchpad.net

Commit message

Add a hint to the existence of the photo roll displayed the first time the user takes a photo.

To post a comment you must log in.
lp://staging/~fboucault/camera-app/photo_roll_hint updated
406. By Florian Boucault

Update pot file.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/camera-app-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/111
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4026
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/783
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14458
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4354
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4354/artifact/work/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:406
http://jenkins.qa.ubuntu.com/job/camera-app-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/112
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/477
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4027
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/784
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14460
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4356
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4356/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://staging/~fboucault/camera-app/photo_roll_hint updated
407. By Florian Boucault

Merged trunk

408. By Florian Boucault

Fix case where photo roll hint is made unnecessary before ever being enabled/displayed.

409. By Florian Boucault

Added autopilot test.

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