Merge lp:~fboucault/camera-app/startup_black_flash_fix into lp:camera-app

[Florian Boucault]

Fix viewfinder short disappearance at startup.
Make overlay controls appear slightly faster at startup.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:581
http://jenkins.qa.ubuntu.com/job/camera-app-ci/433/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/129
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/274
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/928
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/755
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23913

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

[lp:~fboucault/camera-app/startup_black_flash_fix]

582. By Florian Boucault on 2015-10-05

Fix Python syntax errors E265 in autopilot tests.

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-07-03 18:21:34 +0000
+++ ViewFinderOverlay.qml	2015-10-05 13:14:34 +0000
@@ -185,7 +185,17 @@
                 }
             }
 
-            property real progress: (bottomEdge.height - bottomEdge.position) / bottomEdge.height
+            /* At startup, opened is false and 'bottomEdge.height' is 0 until
+               optionsOverlayLoader has finished loading. When that happens
+               'bottomEdge.height' becomes non 0 and 'bottomEdge.position' which
+               depends on bottomEdge.height eventually reaches the value
+               'bottomEdge.height'. Unfortunately during that short period 'progress'
+               has an incorrect value and unfortunate consequences/bugs occur.
+               That makes it important to only compute progress when 'opened' is true.
+
+               Ref.: https://bugs.launchpad.net/ubuntu/+source/camera-app/+bug/1472903
+            */
+            property real progress: opened ? (bottomEdge.height - bottomEdge.position) / bottomEdge.height : 0
             property list<ListModel> options: [
                 ListModel {
                     id: gpsOptionsModel

=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2015-04-29 15:56:44 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2015-10-05 13:14:34 +0000
@@ -159,7 +159,7 @@
         self.pointing_device.click()
 
         # Check that the photo roll hint is displayed
-        #self.assertEquals(hint.visible, True)
+        # self.assertEquals(hint.visible, True)
         self.assertThat(hint.visible, Eventually(Equals(True)))
 
         # Swipe to photo roll

=== modified file 'tests/autopilot/camera_app/tests/test_focus.py'
--- tests/autopilot/camera_app/tests/test_focus.py	2015-04-29 15:56:44 +0000
+++ tests/autopilot/camera_app/tests/test_focus.py	2015-10-05 13:14:34 +0000
@@ -96,7 +96,7 @@
 
         # Check if there's a gap between the viewfinder feed and the zoom
         # control. If there is, test that focusing there won't show the focus
-        #ring.
+        # ring.
         if zoom.y > feed.height:  # Feed is aligned to the top of the window
             x, y, h, w = zoom.globalRect
             click_coords = [x + (h // 2), y - 2]