Fix to check the proximity sensor when determining to show the lock screen.
Fixes #1378043 and #1378012
commit8dd6ea20b2d12b148da354a589f2a97533052f69
authorMichael Frey <michael.frey@canonical.com>
dateMon 20 Oct 2014, 12:04 (12 years ago)
parent1ff2631
qml/Shell.qml+2−1
@@ -594,7 +594,8 @@ Item {
594594 target: Powerd
595595
596596 onStatusChanged: {
597− if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
597+ if ((Powerd.status === Powerd.Off && reason != Powerd.Proximity)
598+ && !callManager.hasCalls && !edgeDemo.running) {
598599 greeter.showNow()
599600 }
600601 }