git.iko.soy/unity8
on xenial help sign in
Added a check for Proximity to determine if we show the lock screen. Fixes: 1378012, 1378043
37b6786Michael Frey
qml/Shell.qml+2−1
compare with xenial
unifiedsplit
@@ -607,7 +607,8 @@ Item {
607 target: Powerd
607 target: Powerd
608
608
609 onStatusChanged: {
609 onStatusChanged: {
610+ if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
610− if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
611+ !callManager.hasCalls && !edgeDemo.running) {
611 greeter.showNow()
612 greeter.showNow()
612 }
613 }
613 }
614 }