70a5ad1 · unity8 · git.iko.soy

plugins/Powerd/Powerd.cpp+1−1

compare with xenial

unifiedsplit

@@ -39,7 +39,7 @@ Powerd::Powerd(QObject* parent)

39 "com.canonical.Unity.Screen",

40 "DisplayPowerStateChange",

41 this,

42− SIGNAL(displayPowerStateChange(int)));

42+ SIGNAL(displayPowerStateChange(int, int)));

43

44 systemSettings = g_settings_new("com.ubuntu.touch.system");

45 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

28{

29 Q_OBJECT

30 Q_ENUMS(Status)

31− Q_FLAGS(DisplayFlag DisplayFlags)

31+ Q_ENUMS(DisplayStateChangeReason)

32

33public:

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+

34 enum Status {

41 enum Status {

35 Off,

42 Off,

36 On,

43 On,

@@ -40,7 +47,7 @@ public:

40 ~Powerd();

47 ~Powerd();

41

48

42Q_SIGNALS:

49Q_SIGNALS:

43− void displayPowerStateChange(int status);

50+ void displayPowerStateChange(int status, int reason);

44

51

45private:

52private:

46 QDBusInterface *powerd;

53 QDBusInterface *powerd;

qml/Shell.qml+1−1

@@ -432,7 +432,7 @@ FocusScope {

432 onDisplayPowerStateChange: {

433 // We ignore any display-off signals when the proximity sensor

434 // is active. This usually indicates something like a phone call.

435− if (status == Powerd.Off) {

435+ if (status == Powerd.Off && reason != Powerd.Proximity) {

436 greeter.showNow();

437 }

438