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
Approved by: Albert Astals Cid
commite15d89bbb711432f421c36d0210190d1d0581a8a
authorMichael Terry <michael.terry@canonical.com>
dateWed 6 Aug 2014, 19:36 (12 years ago)
parent853c96e1d4c112
qml/Shell.qml+1−1
@@ -400,7 +400,7 @@ Item {
400400 onDisplayPowerStateChange: {
401401 // We ignore any display-off signals when the proximity sensor
402402 // 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) {
404404 greeter.showNow();
405405 }
406406