Merge lp:~unity-team/unity/phablet.improve_switchApplicationAnimation into lp:unity/phablet

[Andrea Cimitan]

A little tweak to improve the switch application animation

A little tweak to improve the switch application animation. The change to duration 500 makes it 1:1 with the finger movement, the tweak of the hintAnimation size keeps it consistent with the dash hint and closer to the finger.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/phablet-unity-ci/691/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-unity-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/691/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-unity-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/691/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/phablet-unity-ci/691//rebuild/?

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Is there a bug/design request about this?

review: Needs Information

[Andrea Cimitan (cimi)]

> Is there a bug/design request about this?

Nope, but design was approved by Jouni and was seen by Gerry as well..

[Albert Astals Cid (aacid)]

Gerry/Jouni can you review according Cimi's comment?

[Michał Sawicz (saviq)]

Bump?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/767/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/635/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/769
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/769/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/767
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/643/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/647/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/767/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

I reasked Jouni yesterday, and he remembers the branch and what it does (swipe from right keeps the new application under your finger, instead being detached as now)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/773/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/649/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/653/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/773/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/774/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/650/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/654/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/774/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Ok, approve then

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/265/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/199
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/199

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/267/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/201
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1322

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/269/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/203
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1326

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/270/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/204
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/204/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1330

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Failing tests:
    qmltestrunner.Stage::test_background
    qmltestrunner.Stage::test_dragFromRightEdgeToSwitchApplication
    qmltestrunner.Stage::test_pressingRightEdgeShowsHint

review: Needs Fixing

[Albert Astals Cid (aacid)]

This is breaking the testStage qmluitest, can you have a look?

review: Needs Fixing

[Andrea Cimitan (cimi)]

I'm on it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/785/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/661
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/665
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1333

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/785/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/793/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/669
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/669/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/673
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1341

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/793/rebuild

review: Approve (continuous-integration)

=== modified file 'Components/Stage.qml'
--- Components/Stage.qml	2013-04-02 16:01:09 +0000
+++ Components/Stage.qml	2013-04-29 20:47:28 +0000
@@ -364,7 +364,7 @@
             NumberAnimation {
                 target: newApplicationScreenshot
                 property: "x"
-                duration: 400
+                duration: 500
                 easing.type: Easing.OutQuad
                 to: 0
             }
@@ -403,7 +403,7 @@
     }
 
     property real __startValue: stage.width
-    property real __hintValue: units.gu(4)
+    property real __hintValue: units.gu(1.5) // Should be 3, but 1.5 balances the not-Linear easing of switchToApplicationAnimation
 
     Binding {
         target: switchToApplicationAnimationController

=== modified file 'tests/qmltests/Components/tst_Stage.qml'
--- tests/qmltests/Components/tst_Stage.qml	2013-04-17 13:01:10 +0000
+++ tests/qmltests/Components/tst_Stage.qml	2013-04-29 20:47:28 +0000
@@ -199,14 +199,9 @@
            switch to the next running application. This means (graphically) sliding the
            next application window from Stage's right edge for a small part of its width */
         function test_pressingRightEdgeShowsHint() {
-
-            // it shoulnd't be showing anything at first
-            compare(stage.usingScreenshots, false)
-
             redControl.checked = true
 
             tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            wait(600)
             tryCompare(stage, "usingScreenshots", false) // and then for it to end
             compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "red")
             compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "red")
@@ -214,7 +209,6 @@
             greenControl.checked = true
 
             tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
-            wait(600)
             tryCompare(stage, "usingScreenshots", false) // and then for it to end
             compare(fakeAppManager.mainStageFocusedApplication.desktopFile, "green")
             compare(fakeAppManager.mainStageApplications.get(0).desktopFile, "green")
@@ -239,18 +233,18 @@
 
         function isShowingABitOfNewApp() {
             // it should come from the right and take less than half of the screen
-            // but at least 15% of it
+            // but at least 5% of it
             return newAppScreenshot.x > stage.width/2
-                && newAppScreenshot.x < stage.width*(85/100)
+                && newAppScreenshot.x < stage.width*(95/100)
                 && newAppScreenshot.y === 0
                 && newAppScreenshot.visible
         }
 
         function isCurrentAppFadingOut() {
             // it should get a bit translucent and smaller
-            return oldAppScreenshot.opacity < 0.98
+            return oldAppScreenshot.opacity < 0.99
                 && oldAppScreenshot.opacity >= 0.1
-                && oldAppScreenshot.scale < 0.98
+                && oldAppScreenshot.scale < 0.99
                 && oldAppScreenshot.scale >= 0.1
                 && oldAppScreenshot.visible
         }
@@ -268,9 +262,6 @@
         /* If you flick from the right edge of the stage leftwards it should cause an
            application switch.  */
         function test_dragFromRightEdgeToSwitchApplication() {
-            // it shoulnd't be showing anything at first
-            compare(stage.usingScreenshots, false)
-
             redControl.checked = true
 
             tryCompare(stage, "usingScreenshots", true) // wait for the animation to start
@@ -303,9 +294,6 @@
            When switching between applications, backgrounds are unnecessary, 'cause the
            applications are in front of them. */
         function test_background() {
-            // it shoulnd't be showing anything at first
-            compare(stage.usingScreenshots, false)
-
             redControl.checked = true
             tryCompare(stage, "usingScreenshots", true) // wait for the animation to start