Merge lp:~michael-sheldon/ubuntu-ui-toolkit/fix-1409027 into lp:ubuntu-ui-toolkit/staging

[Michael Sheldon]

Only use stableOrientationAngleTimer in the OrientationHelper when the orientationAngle has been set automatically

Only use stableOrientationAngleTimer in the OrientationHelper when the orientationAngle has been set automatically

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1377
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1353/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/80
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16969

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1353/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Looks good to me and fixes bug 1409027

review: Approve

[Daniel d'Andrada (dandrader)]

A more sound improvement would be to update the public OrientationHelper.orientationAngle only once we decide to do the rotation. Effectively moving "Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)" to a private property. But that's a higher impact change which is not needed at the moment.

[Zsombor Egri (zsombi)]

Good to go, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2014-12-15 12:20:25 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-01-09 14:47:21 +0000
@@ -87,7 +87,7 @@
     // Screen.primaryOrientation and Screen.orientation can change one right after the other,
     // causing orientationAngle to momentarily change. To avoid responding to such
     // intermediate states, wait for its value to stabilize before rotating to it.
-    onOrientationAngleChanged: { stableOrientationAngleTimer.restart(); }
+    onOrientationAngleChanged: { automaticOrientation ? stableOrientationAngleTimer.restart() : d.tryUpdateState(); }
 
     /*!
       The property holds if the OrientationHelper should automatically resize the