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

[Florian Boucault]

Disable controls and prevent navigation while a delayed/timed shoot is ongoing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:661
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/49/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/426
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1026
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27985

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

I have to swipe twice while the timer is running to reach the photo roll. The first swipe stops the counter, the second moves to the photo roll. This sounds confusing to me and I am not sure if it is what you intended.

You added an AP test for timed shooting, which is good, but you did not add a test for the feature in this MR.

review: Needs Fixing

[Florian Boucault (fboucault)]

> I have to swipe twice while the timer is running to reach the photo roll. The
> first swipe stops the counter, the second moves to the photo roll. This sounds
> confusing to me and I am not sure if it is what you intended.
>

It is. We don't have (yet) a cancellation button for the timer.

> You added an AP test for timed shooting, which is good, but you did not add a
> test for the feature in this MR.

I did add tests for most of the features in this MR (disabling the various) controls. Not being able to swipe is not tested indeed.

[Florian Boucault (fboucault)]

> > I have to swipe twice while the timer is running to reach the photo roll.
> The
> > first swipe stops the counter, the second moves to the photo roll. This
> sounds
> > confusing to me and I am not sure if it is what you intended.
> >
>
> It is. We don't have (yet) a cancellation button for the timer.
>
>
> > You added an AP test for timed shooting, which is good, but you did not add
> a
> > test for the feature in this MR.
>
> I did add tests for most of the features in this MR (disabling the various)
> controls. Not being able to swipe is not tested indeed.

Actually, scrap that, the test also checks that swipe is disabled.

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderOverlay.qml	2016-03-07 15:00:51 +0000
@@ -289,6 +289,7 @@
         id: bottomEdgeClose
         anchors.fill: parent
         onClicked: optionsOverlayClose()
+        enabled: !camera.timedCaptureInProgress
     }
 
     OrientationHelper {
@@ -305,7 +306,7 @@
             height: optionsOverlayLoader.height
             onOpenedChanged: optionsOverlayLoader.item.closeValueSelector()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState
-                     && !camera.photoCaptureInProgress
+                     && !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
             opacity: enabled ? 1.0 : 0.3
 
             /* At startup, opened is false and 'bottomEdge.height' is 0 until
@@ -652,13 +653,15 @@
         enabled: visible
 
         function timedShoot(secs) {
+            camera.timedCaptureInProgress = true;
             timedShootFeedback.start();
             shootingTimer.remainingSecs = secs;
             shootingTimer.start();
         }
 
         function cancelTimedShoot() {
-            if (shootingTimer.running) {
+            if (camera.timedCaptureInProgress) {
+                camera.timedCaptureInProgress = false;
                 shootingTimer.stop();
                 timedShootFeedback.stop();
             }
@@ -774,6 +777,7 @@
             onTriggered: {
                 if (remainingSecs == 0) {
                     running = false;
+                    camera.timedCaptureInProgress = false;
                     controls.shoot();
                     timedShootFeedback.stop();
                 } else {
@@ -819,7 +823,7 @@
             iconName: (camera.captureMode == Camera.CaptureStillImage) ? "camcorder" : "camera-symbolic"
             onClicked: controls.changeRecordMode()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState && !main.contentExportMode
-                     && !camera.photoCaptureInProgress
+                     && !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
         }
 
         ShootButton {
@@ -833,6 +837,7 @@
             }
 
             enabled: viewFinderOverlay.readyForCapture && !storageMonitor.diskSpaceCriticallyLow
+                     && !camera.timedCaptureInProgress
             state: (camera.captureMode == Camera.CaptureVideo) ?
                    ((camera.videoRecorder.recorderState == CameraRecorder.StoppedState) ? "record_off" : "record_on") :
                    "camera"
@@ -869,7 +874,7 @@
             }
 
             enabled: !camera.switchInProgress && camera.videoRecorder.recorderState == CameraRecorder.StoppedState
-                     && !camera.photoCaptureInProgress
+                     && !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
             iconName: "camera-flip"
             onClicked: controls.switchCamera()
         }
@@ -892,7 +897,7 @@
             property real maximumScale: 3.0
             property bool active: false
 
-            enabled: !camera.photoCaptureInProgress
+            enabled: !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
             onPinchStarted: {
                 active = true;
                 initialZoom = zoomControl.value;
@@ -918,7 +923,7 @@
                     rightMargin: -bottomEdgeIndicators.height
                 }
                 enabled: camera.focus.isFocusPointModeSupported(Camera.FocusPointCustom) &&
-                         !camera.photoCaptureInProgress
+                         !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
                 onClicked: {
                     camera.manualFocus(mouse.x, mouse.y);
                     mouse.accepted = false;
 
=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderView.qml	2016-03-07 15:00:51 +0000
@@ -96,6 +96,7 @@
         property alias maximumZoom: camera.maximumDigitalZoom
         property bool switchInProgress: false
         property bool photoCaptureInProgress: false
+        property bool timedCaptureInProgress: false
 
         onPhotoCaptureInProgressChanged: {
             if (main.contentExportMode && camera.photoCaptureInProgress) {
 
=== modified file 'camera-app.qml'
--- camera-app.qml	2016-02-23 11:46:52 +0000
+++ camera-app.qml	2016-03-07 15:00:51 +0000
@@ -135,7 +135,9 @@
                 }
             }
         ]
-        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired && !viewFinderView.camera.photoCaptureInProgress
+        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired
+                     && !viewFinderView.camera.photoCaptureInProgress
+                     && !viewFinderView.camera.timedCaptureInProgress
 
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
 
=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2015-11-25 17:00:31 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2016-03-07 15:00:51 +0000
@@ -90,6 +90,10 @@
         """Returns the video resolution button of the camera"""
         return self.get_option_button("videoResolution")
 
+    def get_timer_delay_button(self):
+        """Returns the timer delay option button of the camera"""
+        return self.get_option_button("selfTimerDelay")
+
     def get_stop_watch(self):
         """Returns the stop watch when using the record button of the camera"""
         return self.app.wait_select_single("StopWatch")
 
=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2015-12-01 09:03:34 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2016-03-07 15:00:51 +0000
@@ -83,6 +83,62 @@
         # check that the camera is able to capture another photo
         self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
 
+    """Test taking a picture with a timer set"""
+    def test_take_picture_with_timer(self):
+        delay = 5
+        self.enable_timer("%s seconds" % str(delay))
+
+        # start timed shoot
+        shoot_button = self.main_window.get_exposure_button()
+        self.assertThat(shoot_button.enabled, Eventually(Equals(True)))
+        self.pointing_device.move_to_object(shoot_button)
+        self.pointing_device.click()
+
+        switch_cameras_button = self.main_window.get_swap_camera_button()
+        record_mode_button = self.main_window.get_record_control()
+        view_switcher = self.main_window.get_view_switcher()
+
+        # controls and navigation should be disabled at this point
+        self.assertThat(shoot_button.enabled,
+                        Eventually(Equals(True)))
+        self.assertThat(switch_cameras_button.enabled,
+                        Eventually(Equals(True)))
+        self.assertThat(record_mode_button.enabled,
+                        Eventually(Equals(True)))
+        self.assertThat(view_switcher.interactive,
+                        Eventually(Equals(True)))
+
+        # after the delay controls and navigation should be re-enabled
+        self.assertThat(shoot_button.enabled,
+                        Eventually(Equals(True), timeout=delay))
+        self.assertThat(switch_cameras_button.enabled,
+                        Eventually(Equals(True), timeout=delay))
+        self.assertThat(record_mode_button.enabled,
+                        Eventually(Equals(True), timeout=delay))
+        self.assertThat(view_switcher.interactive,
+                        Eventually(Equals(True), timeout=delay))
+
+    def enable_timer(self, label_value):
+        # open bottom edge
+        bottom_edge = self.main_window.get_bottom_edge()
+        bottom_edge.open()
+
+        # open video resolution option value selector showing the possible
+        # values
+        timer_delay_button = self.main_window.get_timer_delay_button()
+        self.pointing_device.move_to_object(timer_delay_button)
+        self.pointing_device.click()
+        option_value_selector = self.main_window.get_option_value_selector()
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
+
+        # select a 5 seconds delay
+        option = self.main_window.get_option_value_button(label_value)
+        self.pointing_device.move_to_object(option)
+        self.pointing_device.click()
+
+        bottom_edge.close()
+
     def test_record_video(self):
         """Test clicking on the record control.