Merge lp:~fboucault/unity8/animated_splash into lp:unity8

[Florian Boucault]

Application startup: changed splash rectangle to be black instead of white and added a neat little animation.

[lp:~fboucault/unity8/animated_splash]

919. By Florian Boucault on 2014-05-26

Fixed coding style.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:919
http://jenkins.qa.ubuntu.com/job/unity8-ci/3040/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/466
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/913
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/913/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7733

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3040/rebuild

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Looks like the failure is a flaky, unrelated test?

[Michael Zanetti (mzanetti)]

> Looks like the failure is a flaky, unrelated test?

Yes it is. We have a silo improving them already.

[Michael Zanetti (mzanetti)]

Can you please add the checklist from https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

[Florian Boucault (fboucault)]

* Are there any related MPs required for this MP to build/function as expected? Please list.

No.

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes.

* Did you make sure that your branch does not contain spurious tags?

Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

No. Only by around 6 people all engineers.

[Michael Zanetti (mzanetti)]

Ok. I've ran this by Jouni and we're good to go. Code looks good to me and it works nicely.

 * Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

 * Did CI run pass? If not, please explain why.

Known temporary unstable tests. No new failures.

review: Approve

=== added file 'qml/Stages/Dot.qml'
--- qml/Stages/Dot.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/Dot.qml	2014-05-26 14:14:49 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    radius: width
+    width: units.dp(6)
+    height: width
+    color: UbuntuColors.orange
+}

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2014-04-01 18:39:34 +0000
+++ qml/Stages/PhoneStage.qml	2014-05-26 14:14:49 +0000
@@ -214,7 +214,7 @@
     Rectangle {
         id: appSplash2
         anchors.fill: parent
-        color: "white"
+        color: "black"
         visible: priv.secondApplicationStarting
     }
     Image {
@@ -228,8 +228,11 @@
     Rectangle {
         id: appSplash
         anchors.fill: parent
-        color: "white"
+        color: "black"
         visible: priv.applicationStarting
+
+        WaitingDots {
+        }
     }
     Image {
         id: mainScreenshotImage

=== modified file 'qml/Stages/StageWithSideStage.qml'
--- qml/Stages/StageWithSideStage.qml	2014-03-31 11:05:01 +0000
+++ qml/Stages/StageWithSideStage.qml	2014-05-26 14:14:49 +0000
@@ -282,7 +282,10 @@
         id: mainStageSplash
         anchors.fill: root
         anchors.rightMargin: root.width - sideStageImage.x
-        color: "white"
+        color: "black"
+
+        WaitingDots {
+        }
     }
 
     SidestageHandle {
@@ -402,6 +405,9 @@
         id: sideStageSplash
         anchors.fill: parent
         anchors.leftMargin: sideStageImage.x
-        color: "white"
+        color: "black"
+
+        WaitingDots {
+        }
     }
 }

=== added file 'qml/Stages/WaitingDots.qml'
--- qml/Stages/WaitingDots.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/WaitingDots.qml	2014-05-26 14:14:49 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 0.1
+
+Item {
+    id: waitingDots
+
+    // center in parent; waitingDots has no size therefore anchors.centerIn cannot be used
+    x: parent.width / 2
+    y: parent.height / 2
+
+    property var dots: [dot1, dot2, dot3]
+    property var vertices: [[-units.gu(1), -units.gu(1)],
+                            [units.gu(1),  -units.gu(1)],
+                            [0,             units.gu(1)]]
+    property int shift: 0
+
+    function cycle () {
+        var n = vertices.length;
+        shift = (shift + 1) % n;
+
+        for (var i = 0; i < n; i++) {
+            dots[i].x = vertices[(i+shift) % n][0];
+            dots[i].y = vertices[(i+shift) % n][1];
+        }
+    }
+
+    Timer {
+        interval: 800
+        running: waitingDots.visible
+        repeat: true
+        triggeredOnStart: true
+        onTriggered: waitingDots.cycle()
+    }
+
+
+    Dot {
+        id: dot1
+        x: vertices[0][0]
+        y: vertices[0][1]
+        Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
+        Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
+    }
+
+    Dot {
+        id: dot2
+        x: vertices[1][0]
+        y: vertices[1][1]
+        Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
+        Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
+
+    }
+
+    Dot {
+        id: dot3
+        x: vertices[2][0]
+        y: vertices[2][1]
+        Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
+        Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
+    }
+}