camera-app

Merge lp://qastaging/~phablet-team/camera-app/hdr-flash-mutually-exclusive into lp://qastaging/camera-app

  1. hdr-flash-mutually-exclusive
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Merged
Approved by: Florian Boucault
Approved revision: 456
Merged at revision: 486
Proposed branch: lp://qastaging/~phablet-team/camera-app/hdr-flash-mutually-exclusive
Merge into: lp://qastaging/camera-app
Diff against target: 92 lines (+55/-1)
3 files modified
ViewFinderOverlay.qml (+3/-0)
tests/autopilot/camera_app/emulators/main_window.py (+4/-0)
tests/autopilot/camera_app/tests/test_flash.py (+48/-1)
To merge this branch: bzr merge lp://qastaging/~phablet-team/camera-app/hdr-flash-mutually-exclusive
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Florian Boucault (community) Needs Fixing
Review via email: mp+245010@code.qastaging.launchpad.net

Commit message

Make hdr and flash options mutually exclusive

Description of the change

Make hdr and flash options mutually exclusive

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

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/camera-app-ci/350/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/46
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/69
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/342/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/101
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16656
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/281/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/348/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

I would think that the Android backend automatically lists hdr as disabled when flash is enabled and vice versa, no?

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

It is not enough to set the right values, the values that should not be possible should be made unavailable to the user as well (options disabled in the UI).

review: Needs Fixing
lp://qastaging/~phablet-team/camera-app/hdr-flash-mutually-exclusive updated
456. By Ugo Riboni

Merge changes from trunk

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

FAILED: Continuous integration, rev:456
http://jenkins.qa.ubuntu.com/job/camera-app-ci/356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/79
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/400
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/151
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17119
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/416
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/416/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/356/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