git.iko.soy/unity8
on xenial help sign in
When greeter or lockscreen has focus, show active call panel. Fixes: 1378872
0813bd2Michael Terry
qml/Components/Lockscreen.qml+2−1
compare with xenial
unifiedsplit
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 1.0
18import Ubuntu.Components 1.0
19import Ubuntu.Components.Popups 1.0
19import Ubuntu.Components.Popups 1.0
20+import Ubuntu.Telephony 0.1 as Telephony
20
21
21Showable {
22Showable {
22 id: root
23 id: root
@@ -217,7 +218,7 @@ Showable {
217 objectName: "emergencyCallLabel"
218 objectName: "emergencyCallLabel"
218 anchors.horizontalCenter: parent.horizontalCenter
219 anchors.horizontalCenter: parent.horizontalCenter
219
220
220− text: i18n.tr("Emergency Call")
221+ text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency Call")
221 color: "#f3f3e7"
222 color: "#f3f3e7"
222 }
223 }
223
224
qml/Panel/ActiveCallHint.qml+3−1
@@ -23,6 +23,8 @@ import "../Components"
23Item {
23Item {
24 id: callHint
24 id: callHint
25
25
26+ property bool greeterShown: false
27+
26 readonly property bool active: {
28 readonly property bool active: {
27 var application = ApplicationManager.findApplication("dialer-app");
29 var application = ApplicationManager.findApplication("dialer-app");
28
30
@@ -33,7 +35,7 @@ Item {
33 return application.state !== ApplicationInfoInterface.Starting;
35 return application.state !== ApplicationInfoInterface.Starting;
34 }
36 }
35 }
37 }
36− if (ApplicationManager.focusedApplicationId !== "dialer-app") {
38+ if (greeterShown || ApplicationManager.focusedApplicationId !== "dialer-app") {
37 if (application) {
39 if (application) {
38 // Don't show if application is still starting; might get a fleeting true/false.
40 // Don't show if application is still starting; might get a fleeting true/false.
39 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;
41 return application.state !== ApplicationInfoInterface.Starting && callManager.hasCalls;
qml/Shell.qml+3
@@ -672,6 +672,9 @@ Item {
672 // TODO: This should be sourced by device type (eg "desktop", "tablet", "phone"...)
672 // TODO: This should be sourced by device type (eg "desktop", "tablet", "phone"...)
673 Component.onCompleted: initialise(indicatorProfile)
673 Component.onCompleted: initialise(indicatorProfile)
674 }
674 }
675+ callHint {
676+ greeterShown: greeter.shown || lockscreen.shown
677+ }
675
678
676 property bool topmostApplicationIsFullscreen:
679 property bool topmostApplicationIsFullscreen:
677 ApplicationManager.focusedApplicationId &&
680 ApplicationManager.focusedApplicationId &&