Merge lp:~mzanetti/unity8/fade-out-launcher into lp:unity8

[Michael Zanetti]

Fade out launcher in place instead of moving it to the left on long left edge swipes.

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

N/A

 * 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?

no

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

reviewer from design requested

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/unity8-ci/3192/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1088
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/286
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/286
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1908
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1908/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8716

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/fade-out-launcher]

979. By Michael Zanetti on 2014-07-01

merge trunk

[Vesa Rautiainen (vesar)]

Looks good

review: Approve (design)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:979
http://jenkins.qa.ubuntu.com/job/unity8-ci/3284/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1398
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/288/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/378
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/378
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2347
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9088

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/fade-out-launcher]

980. By Michael Zanetti on 2014-07-08

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/unity8-ci/3364/
Executed test runs:
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1686/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/458
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/458/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2726
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2726/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Shouldn't this happen when left-swiping the greeter, too?

See inline.

review: Needs Information

[lp:~mzanetti/unity8/fade-out-launcher]

981. By Michael Zanetti on 2014-07-09

fix comments from review

982. By Michael Zanetti on 2014-07-09

oops. better now

[Michael Zanetti (mzanetti)]

> Shouldn't this happen when left-swiping the greeter, too?
>
> See inline.

fixed

[Michał Sawicz (saviq)]

 * 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.
Aborted. Will run now after the last commits.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:982
http://jenkins.qa.ubuntu.com/job/unity8-ci/3379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/473
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2811
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2811/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9539

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

review: Approve (continuous-integration)

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2014-03-25 11:34:34 +0000
+++ qml/Launcher/Launcher.qml	2014-07-09 13:38:22 +0000
@@ -55,6 +55,10 @@
         switchToNextState("")
     }
 
+    function fadeOut() {
+        fadeOutAnimation.start();
+    }
+
     function switchToNextState(state) {
         animateTimer.nextState = state
         animateTimer.start();
@@ -99,6 +103,31 @@
         }
     }
 
+    SequentialAnimation {
+        id: fadeOutAnimation
+        ScriptAction {
+            script: {
+                panel.layer.enabled = true
+            }
+        }
+        UbuntuNumberAnimation {
+            target: panel
+            property: "opacity"
+            easing.type: Easing.InQuad
+            to: 0
+        }
+        ScriptAction {
+            script: {
+                panel.layer.enabled = false
+                panel.animate = false;
+                root.state = "";
+                panel.x = -panel.width
+                panel.opacity = 1;
+                panel.animate = true;
+            }
+        }
+    }
+
     MouseArea {
         id: launcherDragArea
         enabled: root.state == "visible"
@@ -173,9 +202,9 @@
         }
 
         Behavior on x {
+            enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate;
             NumberAnimation {
-                // Disabling animation when dragging
-                duration: dragArea.dragging || launcherDragArea.drag.active ?  0 : 300;
+                duration: 300
                 easing.type: Easing.OutCubic
             }
         }
@@ -215,9 +244,10 @@
         onDraggingChanged: {
             if (!dragging) {
                 if (distance > panel.width / 2) {
-                    root.switchToNextState("visible")
                     if (distance > minimizeDistance) {
                         root.dash()
+                    } else {
+                        root.switchToNextState("visible")
                     }
                 } else {
                     root.switchToNextState("")

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-06-24 16:27:07 +0000
+++ qml/Shell.qml	2014-07-09 13:38:22 +0000
@@ -534,15 +534,16 @@
                 showHome()
             }
             onDash: {
-                if (stages.shown && !stages.overlayMode) {
-                    if (!stages.locked) {
-                        stages.hide();
-                        launcher.hide();
-                    }
+                if (stages.shown && !stages.overlayMode && !stages.locked) {
+                    stages.hide();
+                    launcher.fadeOut();
+                } else {
+                    launcher.switchToNextState("visible");
                 }
+
                 if (greeter.shown) {
                     greeter.hideRight();
-                    launcher.hide();
+                    launcher.fadeOut();
                 }
             }
             onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)