Merge lp:~mterry/unity8/active-call-in-greeter into lp:unity8

[Michael Terry]

When greeter or lockscreen has focus, show active call panel.

When greeter or lockscreen has focus, show active call panel.

== Checklist ==

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1278
http://jenkins.qa.ubuntu.com/job/unity8-ci/4548/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5698/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1642
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6950/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1278
http://jenkins.qa.ubuntu.com/job/unity8-ci/4550/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5700/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1644
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6952/console
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6952/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1278
http://jenkins.qa.ubuntu.com/job/unity8-ci/4553/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1647
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6963
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6963/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14375

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/active-call-in-greeter]

1279. By Michael Terry on 2014-10-09

Switch text of emergency call button when in a call

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1279
http://jenkins.qa.ubuntu.com/job/unity8-ci/4585/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5754
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1681
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1679
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7006
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7006/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14428

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1279
http://jenkins.qa.ubuntu.com/job/unity8-ci/4692/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1786
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7298
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14837

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

 * 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.
Not related

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

review: Approve

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2014-10-07 08:19:36 +0000
+++ qml/Components/Lockscreen.qml	2014-10-09 12:52:28 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.0
 import Ubuntu.Components.Popups 1.0
+import Ubuntu.Telephony 0.1 as Telephony
 
 Showable {
     id: root
@@ -217,7 +218,7 @@
             objectName: "emergencyCallLabel"
             anchors.horizontalCenter: parent.horizontalCenter
 
-            text: i18n.tr("Emergency Call")
+            text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")
             color: "#f3f3e7"
         }
 

=== modified file 'qml/Panel/ActiveCallHint.qml'
--- qml/Panel/ActiveCallHint.qml	2014-09-11 00:57:20 +0000
+++ qml/Panel/ActiveCallHint.qml	2014-10-09 12:52:28 +0000
@@ -23,6 +23,8 @@
 Item {
     id: callHint
 
+    property bool greeterShown: false
+
     readonly property bool active: {
         var application = ApplicationManager.findApplication("dialer-app");
 
@@ -33,7 +35,7 @@
                 return application.state !== ApplicationInfoInterface.Starting;
             }
         }
-        if (ApplicationManager.focusedApplicationId !== "dialer-app") {
+        if (greeterShown || ApplicationManager.focusedApplicationId !== "dialer-app") {
             if (application) {
                 // Don't show if application is still starting; might get a fleeting true/false.
                 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-09 12:52:28 +0000
+++ qml/Shell.qml	2014-10-09 12:52:28 +0000
@@ -640,6 +640,9 @@
                 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
                 panelHeight: units.gu(3)
             }
+            callHint {
+                greeterShown: greeter.shown || lockscreen.shown
+            }
 
             property bool topmostApplicationIsFullscreen:
                 ApplicationManager.focusedApplicationId &&