git.iko.soy/unity8
on xenial help sign in
Update to use display power state change reason
commit70a5ad18df0c4dec62580f6ef2fc4a055248bdf5 authorAlberto Aguirre <alberto.aguirre@canonical.com> dateTue 20 May 2014, 21:45 (12 years ago) parent31cd76f
3 files changed+11−4
compare with xenial
unifiedsplit
plugins/Powerd/Powerd.cpp+1−1 plugins/Powerd/Powerd.h+9−2 qml/Shell.qml+1−1
plugins/Powerd/Powerd.cpp+1−1
@@ -39,7 +39,7 @@ Powerd::Powerd(QObject* parent)
3939 "com.canonical.Unity.Screen",
4040 "DisplayPowerStateChange",
4141 this,
42− SIGNAL(displayPowerStateChange(int)));
42+ SIGNAL(displayPowerStateChange(int, int)));
4343
4444 systemSettings = g_settings_new("com.ubuntu.touch.system");
4545 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), powerd);
plugins/Powerd/Powerd.h+9−2
@@ -28,9 +28,16 @@ class Powerd: public QObject
2828{
2929 Q_OBJECT
3030 Q_ENUMS(Status)
31− Q_FLAGS(DisplayFlag DisplayFlags)
31+ Q_ENUMS(DisplayStateChangeReason)
3232
3333public:
34+ enum DisplayStateChangeReason {
35+ Normal = 0,
36+ Inactivity = 1, // Display changed state due to inactivity
37+ PowerKey = 2, // Display changed state due to user pressing power key
38+ Proximity = 3, // Display changed state due to proximity events
39+ };
40+
3441 enum Status {
3542 Off,
3643 On,
@@ -40,7 +47,7 @@ public:
4047 ~Powerd();
4148
4249Q_SIGNALS:
43− void displayPowerStateChange(int status);
50+ void displayPowerStateChange(int status, int reason);
4451
4552private:
4653 QDBusInterface *powerd;
qml/Shell.qml+1−1
@@ -432,7 +432,7 @@ FocusScope {
432432 onDisplayPowerStateChange: {
433433 // We ignore any display-off signals when the proximity sensor
434434 // is active. This usually indicates something like a phone call.
435− if (status == Powerd.Off) {
435+ if (status == Powerd.Off && reason != Powerd.Proximity) {
436436 greeter.showNow();
437437 }
438438