Added a check for Proximity to determine if we show the lock screen. Fixes: 1378012, 1378043
Approved by: Michael Terry
commit37b6786fb6066e19877bba46d945ef4d20abf90f
authorMichael Frey <michael.frey@canonical.com>
dateThu 30 Oct 2014, 21:40 (12 years ago)
parent41806ab35fb4d9
qml/Shell.qml+2−1
@@ -607,7 +607,8 @@ Item {
607607 target: Powerd
608608
609609 onStatusChanged: {
610− if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
610+ if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
611+ !callManager.hasCalls && !edgeDemo.running) {
611612 greeter.showNow()
612613 }
613614 }