Merge lp:~aacid/unity8/fix_left_swipe_temp_scope_overview into lp:unity8

[Albert Astals Cid]

Close overview temp scope on show dash

 * Are there any related MPs required for this MP to build/function as expected?
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?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1302
http://jenkins.qa.ubuntu.com/job/unity8-ci/4449/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5333
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1543
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6585
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13941

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Dash overview flickers for a moment when you do the left edge drag over a non-favorite scope.

It's better than what happens now (described in the bug), but still it's not nice.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> Dash overview flickers for a moment when you do the left edge drag over a non-
> favorite scope.
>
> It's better than what happens now (described in the bug), but still it's not
> nice.

Video showing the flicker:
https://www.dropbox.com/s/tez3cjl7qrodj5i/video20140930_154640862.mp4?dl=0

[lp:~aacid/unity8/fix_left_swipe_temp_scope_overview]

1303. By Albert Astals Cid on 2014-10-01

Do the overview temp closing later to prevent a quick show of the overview and don't animate either if we are on the overview temp scope

[Albert Astals Cid (aacid)]

> Dash overview flickers for a moment when you do the left edge drag over a non-
> favorite scope.
>
> It's better than what happens now (described in the bug), but still it's not
> nice.

Should be fixed now, please re-check.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1303
http://jenkins.qa.ubuntu.com/job/unity8-ci/4457/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5368
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1453
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1551
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6620
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13988

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

it's ok now

review: Approve

[Daniel d'Andrada (dandrader)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes. It's fine.

* Did CI run pass? If not, please explain why.
No. Seem to be unrelated failures

* Did you make sure that the branch does not contain spurious tags?
Yes.

[lp:~aacid/unity8/fix_left_swipe_temp_scope_overview]

1304. By Albert Astals Cid on 2014-10-06

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1304
http://jenkins.qa.ubuntu.com/job/unity8-ci/4569/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1663
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6985
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6985/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14401

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-10-06 08:00:45 +0000
+++ qml/Dash/Dash.qml	2014-10-06 15:57:12 +0000
@@ -41,8 +41,9 @@
                     if (window.active) {
                         dashContentCache.scheduleUpdate();
                     }
-                    overviewController.enableAnimation = window.active;
+                    overviewController.enableAnimation = window.active && !scopesOverview.showingNonFavoriteScope;
                     overviewController.progress = 0;
+                    scopesOverview.closeTempScope();
                 }
             }
         }

=== modified file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml	2014-09-18 21:23:55 +0000
+++ qml/Dash/ScopesOverview.qml	2014-10-06 15:57:12 +0000
@@ -98,6 +98,14 @@
         value: progress === 1
     }
 
+    function closeTempScope() {
+        if (tempScopeItem.scope) {
+            root.scope.closeScope(tempScopeItem.scope);
+            tempScopeItem.scope = null;
+            tempScopeItem.backClicked()
+        }
+    }
+
     function animateDashFromAll(scopeId) {
         var currentScopePos = allScopeCardPosition(scopeId);
         if (currentScopePos) {