Merge lp:~nik90/ubuntu-clock-app/add-stopwatch-lap-animation into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Adds a subtle animation to the stopwatch lap list which now slides from the bottom when a new lap is added by the user.

Adds a subtle animation to the stopwatch lap list which now slides from the bottom when a new lap is added by the user.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:381
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/339/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1869
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/339
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/339
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/257

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/339/rebuild

review: Approve (continuous-integration)

[Paolo Rotolo (paolorotolo)]

Looks good to me!

review: Approve

=== modified file 'stopwatch/LapList.qml'
--- stopwatch/LapList.qml	2014-02-26 20:27:13 +0000
+++ stopwatch/LapList.qml	2014-03-26 16:41:22 +0000
@@ -37,6 +37,7 @@
     property int maxItemsVisible
 
     height: childrenRect.height
+    visible: lapModel.count !== 0
 
     ListItem.ThinDivider { id: divider}
 

=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml	2014-02-20 23:34:53 +0000
+++ stopwatch/StopwatchPage.qml	2014-03-26 16:41:22 +0000
@@ -294,9 +294,19 @@
                 lapModel: laps
                 width: parent.width
                 height: childrenRect.height
-                anchors.top: stopwatchFacePhoneLayoutContainer.bottom
+                anchors.top: parent.bottom
                 maxItemsVisible: !wideAspect ? 5 : parseInt((stopwatchPage.height - headerHeight)/units.gu(6))
 
+                states: State {
+                    name: "newlap"
+                    when: laps.count !== 0 && !wideAspect
+                    AnchorChanges { target: listLap; anchors.top: stopwatchFacePhoneLayoutContainer.bottom }
+                }
+
+                transitions: Transition {
+                    AnchorAnimation { duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing }
+                }
+
             }
         }
     }