← Back to branch summary

~om26er/unity8/launcher_integration_test

« back to all changes in this revision

Viewing changes to qml/Shell.qml

  • Committer: Omer Akram
  • Date: 2014-07-03 13:24:52 UTC
  • mfrom: (984.1.14 unity8)
  • Revision ID: om26er@ubuntu.com-20140703132452-zi2e9z465998ezjb
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Shell.qml
452
452
        onDisplayPowerStateChange: {
453
453
            // We ignore any display-off signals when the proximity sensor
454
454
            // is active.  This usually indicates something like a phone call.
455
 
            if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {
 
455
            if (status == Powerd.Off && reason != Powerd.Proximity) {
456
456
                greeter.showNow();
457
457
            }
458
458