Merge lp:~mterry/unity8/lock-during-call into lp:unity8

[Michael Terry]

Allow locking the screen during a phone call.

Allow locking the screen during a phone call.

In addition to checking the proximity sensor [1], we need to pass the phone call from the user session to the greeter.

[1] We want to ignore screen blanks that are proximity-related, since that's not actually a request for a lock.

[Albert Astals Cid (aacid)]

Mike you proposed this more than one year ago, is this still a "Work in Progress" or shall it be deleted?

review: Needs Information

[Michael Terry (mterry)]

It's still work in progress in the sense that it needs to be updated with latest code. But the bug is still open and valid. Just not high importance.

Unmerged revisions

280. By Michael Terry on 2013-09-04

Rough cut at listening to proximity events

=== modified file 'Shell.qml'
--- Shell.qml	2013-09-02 11:24:59 +0000
+++ Shell.qml	2013-09-04 19:37:06 +0000
@@ -513,7 +513,8 @@
         onDisplayPowerStateChange: {
             // We ignore any display-off signals when the proximity sensor
             // is active.  This usually indicates something like a phone call.
-            if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {
+            var proximate = (flags & Powerd.UseProximity) && Powerd.nearProximity;
+            if (status == Powerd.Off && !proximate) {
                 powerConnection.setFocused(false);
                 greeter.show();
             } else if (status == Powerd.On) {

=== modified file 'debian/control'
--- debian/control	2013-09-03 23:38:15 +0000
+++ debian/control	2013-09-04 19:37:06 +0000
@@ -16,6 +16,7 @@
                libnih-dev,
                libnm-glib-dev,
                libnm-util-dev,
+               libplatform-api1-dev,
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
                libqt5v8-5-private-dev,

=== modified file 'plugins/Powerd/CMakeLists.txt'
--- plugins/Powerd/CMakeLists.txt	2013-08-02 16:18:28 +0000
+++ plugins/Powerd/CMakeLists.txt	2013-09-04 19:37:06 +0000
@@ -8,6 +8,15 @@
     )
 
 qt5_use_modules(Powerd-qml DBus Qml)
+pkg_check_modules(UA REQUIRED ubuntu-platform-api)
+
+include_directories(
+    ${UA_INCLUDE_DIRS}
+    )
+
+target_link_libraries(Powerd-qml
+    ${UA_LDFLAGS}
+    )
 
 export_qmlfiles(Powerd Powerd)
 export_qmlplugin(Powerd 0.1 Powerd TARGETS Powerd-qml)

=== modified file 'plugins/Powerd/Powerd.cpp'
--- plugins/Powerd/Powerd.cpp	2013-08-20 21:04:22 +0000
+++ plugins/Powerd/Powerd.cpp	2013-09-04 19:37:06 +0000
@@ -17,20 +17,44 @@
  */
 
 #include "Powerd.h"
+#include <ubuntu/application/sensors/proximity.h>
 
 Powerd::Powerd(QObject* parent)
   : QObject(parent),
-    powerd(NULL)
-{
-    powerd = new QDBusInterface("com.canonical.powerd",
-                                "/com/canonical/powerd",
-                                "com.canonical.powerd",
-                                QDBusConnection::SM_BUSNAME(), this);
-
-    powerd->connection().connect("com.canonical.powerd",
-                                 "/com/canonical/powerd",
-                                 "com.canonical.powerd",
-                                 "DisplayPowerStateChange",
-                                 this,
-                                 SIGNAL(displayPowerStateChange(int, unsigned int)));
+    m_powerd(NULL),
+    m_proximitySensor(ua_sensors_proximity_new()) // Note: seems no way to free...
+{
+    m_powerd = new QDBusInterface("com.canonical.powerd",
+                                  "/com/canonical/powerd",
+                                  "com.canonical.powerd",
+                                  QDBusConnection::SM_BUSNAME(), this);
+
+    m_powerd->connection().connect("com.canonical.powerd",
+                                   "/com/canonical/powerd",
+                                   "com.canonical.powerd",
+                                   "DisplayPowerStateChange",
+                                   this,
+                                   SIGNAL(displayPowerStateChange(int, unsigned int)));
+
+    if (m_proximitySensor) {
+        ua_sensors_proximity_set_reading_cb(m_proximitySensor,
+                                            onProximityEvent,
+                                            this);
+    }
+}
+
+bool Powerd::getNearProximity()
+{
+    return m_nearProximity;
+}
+
+void Powerd::onProximityEvent(UASProximityEvent *event, void *context)
+{
+    auto powerd = (Powerd*)context;
+
+    bool isNear = uas_proximity_event_get_distance(event) == U_PROXIMITY_NEAR;
+    if (isNear != powerd->m_nearProximity) {
+        powerd->m_nearProximity = isNear;
+        Q_EMIT powerd->nearProximityChanged();
+    }
 }

=== modified file 'plugins/Powerd/Powerd.h'
--- plugins/Powerd/Powerd.h	2013-08-21 20:04:24 +0000
+++ plugins/Powerd/Powerd.h	2013-09-04 19:37:06 +0000
@@ -23,12 +23,19 @@
 #include <QtCore/QObject>
 #include <QtDBus/QDBusInterface>
 
+typedef void UASProximityEvent;
+typedef void UASensorsProximity;
+
 class Powerd: public QObject
 {
     Q_OBJECT
     Q_ENUMS(Status)
     Q_FLAGS(DisplayFlag DisplayFlags)
 
+    Q_PROPERTY(bool nearProximity
+               READ getNearProximity
+               NOTIFY nearProximityChanged)
+
 public:
     enum DisplayFlag {
         UseProximity          = 1, // Use proximity sensor to override screen state
@@ -44,11 +51,18 @@
 
     explicit Powerd(QObject *parent = 0);
 
+    bool getNearProximity();
+
 Q_SIGNALS:
     void displayPowerStateChange(int status, unsigned int flags);
+    void nearProximityChanged();
 
 private:
-    QDBusInterface *powerd;
+    static void onProximityEvent(UASProximityEvent *event, void *context);
+
+    QDBusInterface *m_powerd;
+    bool m_nearProximity;
+    UASensorsProximity *m_proximitySensor;
 };
 
 #endif

=== modified file 'tests/mocks/Powerd/Powerd.cpp'
--- tests/mocks/Powerd/Powerd.cpp	2013-08-08 13:58:12 +0000
+++ tests/mocks/Powerd/Powerd.cpp	2013-09-04 19:37:06 +0000
@@ -22,3 +22,8 @@
   : QObject(parent)
 {
 }
+
+bool Powerd::getNearProximity()
+{
+    return false;
+}

=== modified file 'tests/mocks/Powerd/Powerd.h'
--- tests/mocks/Powerd/Powerd.h	2013-08-21 20:04:24 +0000
+++ tests/mocks/Powerd/Powerd.h	2013-09-04 19:37:06 +0000
@@ -27,6 +27,10 @@
     Q_ENUMS(Status)
     Q_FLAGS(DisplayFlag DisplayFlags)
 
+    Q_PROPERTY(bool nearProximity
+               READ getNearProximity
+               NOTIFY nearProximityChanged)
+
 public:
     enum DisplayFlag {
         UseProximity          = 1, // Use proximity sensor to override screen state
@@ -42,8 +46,11 @@
 
     explicit Powerd(QObject *parent = 0);
 
+    bool getNearProximity();
+
 Q_SIGNALS:
     void displayPowerStateChange(int status, unsigned int flags);
+    void nearProximityChanged();
 };
 
 #endif