Merge lp:~tiagosh/dialer-app/rtm-14.09-fix-1410961 into lp:dialer-app/rtm-14.09

[Tiago Salem Herrmann]

Give some time to finish the greeter animation before removing the LiveCall view.

Give some time to finish the greeter animation before removing the LiveCall view.

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2015-01-17 02:41:56 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-01-17 02:41:56 +0000
@@ -192,7 +192,7 @@
 
         State {
             name: "closing"
-            when: closeTimer.running
+            when: closeTimer.running || greeterAnimationTimer.running
 
             PropertyChanges {
                 target: buttonsArea
@@ -255,19 +255,30 @@
     }
 
     Timer {
+        id: greeterAnimationTimer
+        interval: 1000
+        repeat: false
+        running: false
+        onTriggered: mainView.removeLiveCallView()
+    }
+ 
+    Timer {
         id: closeTimer
-        interval: 3000
+        interval: mainView.greeterMode ? 2000 : 3000
         repeat: false
         running: false
         onTriggered: {
             if (!callManager.hasCalls) {
-                mainView.removeLiveCallView();
+                if (!mainView.greeterMode) {
+                    mainView.removeLiveCallView();
+                }
                 // TODO: we can't be sure that the currentPage is a DialerPage instance
                 if (pageStackNormalMode.currentPage.dialNumber) {
                     pageStackNormalMode.currentPage.dialNumber = pendingNumberToDial;
                 }
                 if (mainView.greeterMode) {
                     greeter.showGreeter();
+                    greeterAnimationTimer.running = true
                 }
             }
         }