git.iko.soy/unity8
on xenial help sign in
When the edge demo is running, don't show the greeter if the screen is turned off. This avoids an odd interaction where parts of the greeter are disabled but the edge demo isn't visible until you slide the greeter away. Fixes: 1283425
e15d89bMichael Terry
qml/Shell.qml+1−1
compare with xenial
unifiedsplit
@@ -400,7 +400,7 @@ Item {
400 onDisplayPowerStateChange: {
400 onDisplayPowerStateChange: {
401 // We ignore any display-off signals when the proximity sensor
401 // We ignore any display-off signals when the proximity sensor
402 // is active. This usually indicates something like a phone call.
402 // is active. This usually indicates something like a phone call.
403− if (status == Powerd.Off && reason != Powerd.Proximity) {
403+ if (status == Powerd.Off && reason != Powerd.Proximity && !edgeDemo.running) {
404 greeter.showNow();
404 greeter.showNow();
405 }
405 }
406
406