When greeter or lockscreen has focus, show active call panel. Fixes: 1378872
Approved by: Nick Dedekind
commit0813bd21c81dba40488cb2038af83dfa5b86ff2d
authorMichael Terry <michael.terry@canonical.com>
dateThu 30 Oct 2014, 21:41 (12 years ago)
parent070662172dca63
qml/Components/Lockscreen.qml+2−1
@@ -17,6 +17,7 @@
1717import QtQuick 2.0
1818import Ubuntu.Components 1.0
1919import Ubuntu.Components.Popups 1.0
20+import Ubuntu.Telephony 0.1 as Telephony
2021
2122Showable {
2223 id: root
@@ -217,7 +218,7 @@ Showable {
217218 objectName: "emergencyCallLabel"
218219 anchors.horizontalCenter: parent.horizontalCenter
219220
220− text: i18n.tr("Emergency Call")
221+ text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")
221222 color: "#f3f3e7"
222223 }
223224
qml/Panel/ActiveCallHint.qml+3−1
@@ -23,6 +23,8 @@ import "../Components"
2323Item {
2424 id: callHint
2525
26+ property bool greeterShown: false
27+
2628 readonly property bool active: {
2729 var application = ApplicationManager.findApplication("dialer-app");
2830
@@ -33,7 +35,7 @@ Item {
3335 return application.state !== ApplicationInfoInterface.Starting;
3436 }
3537 }
36− if (ApplicationManager.focusedApplicationId !== "dialer-app") {
38+ if (greeterShown || ApplicationManager.focusedApplicationId !== "dialer-app") {
3739 if (application) {
3840 // Don't show if application is still starting; might get a fleeting true/false.
3941 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;
qml/Shell.qml+3
@@ -672,6 +672,9 @@ Item {
672672 // TODO: This should be sourced by device type (eg "desktop", "tablet", "phone"...)
673673 Component.onCompleted: initialise(indicatorProfile)
674674 }
675+ callHint {
676+ greeterShown: greeter.shown || lockscreen.shown
677+ }
675678
676679 property bool topmostApplicationIsFullscreen:
677680 ApplicationManager.focusedApplicationId &&