git.iko.soy/unity8
on xenial help sign in
Don't try to show greeter when call is over, dialer can manager that
6d66001Michael Terry
qml/Shell.qml+3−13
compare with xenial
unifiedsplit
@@ -375,24 +375,14 @@ Item {
375 }
375 }
376 }
376 }
377
377
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−
390 Connections {
378 Connections {
391 id: powerConnection
379 id: powerConnection
392 target: Powerd
380 target: Powerd
393
381
394 onStatusChanged: {
382 onStatusChanged: {
395− showGreeterIfScreenIsOff()
383+ if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
384+ greeter.showNow()
385+ }
396
386
397 // No reason to chew demo CPU when user isn't watching
387 // No reason to chew demo CPU when user isn't watching
398 if (Powerd.status === Powerd.Off) {
388 if (Powerd.status === Powerd.Off) {