on xenial help sign in
Don't try to show greeter when call is over, dialer can manager that
commit6d6600121af8736a1a74f0a9935d8e2a357b1784 authorMichael Terry <michael.terry@canonical.com> dateMon 11 Aug 2014, 13:39 (12 years ago) parent9612984
1 file changed+3−13
qml/Shell.qml+3−13
qml/Shell.qml+3−13
@@ -375,24 +375,14 @@ Item {
375375 }
376376 }
377377
378− function showGreeterIfScreenIsOff() {
379− if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
380− greeter.showNow()
381− }
382− }
383−
384− Connections {
385− id: callConnection
386− target: callManager
387− onHasCallsChanged: showGreeterIfScreenIsOff()
388− }
389−
390378 Connections {
391379 id: powerConnection
392380 target: Powerd
393381
394382 onStatusChanged: {
395− showGreeterIfScreenIsOff()
383+ if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
384+ greeter.showNow()
385+ }
396386
397387 // No reason to chew demo CPU when user isn't watching
398388 if (Powerd.status === Powerd.Off) {