camera-app

Merge lp://qastaging/~fboucault/camera-app/bottom_edge_hint into lp://qastaging/camera-app

  1. bottom_edge_hint
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 533
Merged at revision: 535
Proposed branch: lp://qastaging/~fboucault/camera-app/bottom_edge_hint
Merge into: lp://qastaging/camera-app
Diff against target: 344 lines (+230/-66)
5 files modified
BottomEdgeIndicators.qml (+104/-0)
ViewFinderOverlay.qml (+2/-64)
debian/control (+1/-0)
tests/unittests/CMakeLists.txt (+7/-2)
tests/unittests/tst_BottomEdgeIndicators.qml (+116/-0)
To merge this branch: bzr merge lp://qastaging/~fboucault/camera-app/bottom_edge_hint
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+251940@code.qastaging.launchpad.net

Commit message

Show placeholder bottom edge hint when no option is set so that the user can always guess the existence of the bottom edge.

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

FAILED: Continuous integration, rev:530
http://jenkins.qa.ubuntu.com/job/camera-app-ci/399/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/95/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/168
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/688/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/407
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18585
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/806/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

Code LGTM and does what it says on the tin

review: Approve
Revision history for this message
Bill Filler (bfiller) wrote :

needs test

Revision history for this message
Florian Boucault (fboucault) wrote :

Test added.

On Wed, Mar 11, 2015 at 3:31 PM, Bill Filler <email address hidden>
wrote:

> needs test
> --
>
> https://code.launchpad.net/~fboucault/camera-app/bottom_edge_hint/+merge/251940
> You are the owner of lp:~fboucault/camera-app/bottom_edge_hint.
>

lp://qastaging/~fboucault/camera-app/bottom_edge_hint updated
534. By Florian Boucault

Reverted unrelated change.

Revision history for this message
Florian Boucault (fboucault) wrote :

Tests now successfully pass in CI.

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