Merge lp:~mterry/unity8/auto-brightness into lp:unity8

[Michael Terry]

Pass user's preference for auto-brightness on to powerd.

Pass user's preference for auto-brightness on to powerd.

This is just step one to avoid regressions. Step two+ is to move this logic to USC so we can properly handle multiple unity8 sessions all trying to manage this value.

You can test with commands like the following:
sudo -u phablet -i gsettings set com.ubuntu.touch.system auto-brightness false
sudo -u phablet -i gsettings set com.ubuntu.touch.system auto-brightness true

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 - Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 - N/A

 * If you changed the UI, has there been a design review?
 - N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:785
http://jenkins.qa.ubuntu.com/job/unity8-ci/2643/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1168
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4364
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4364/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3866
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3866/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6145
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5238

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2643/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Tested with powerd available in silo 7 (https://launchpad.net/~ci-train-ppa-service/+archive/landing-007/), and worked as expected.

Thanks!

review: Approve

[lp:~mterry/unity8/auto-brightness]

786. By Michael Terry on 2014-03-27

Depend on schemas

=== modified file 'build'
--- build	2014-01-29 19:12:48 +0000
+++ build	2014-03-27 15:49:21 +0000
@@ -41,6 +41,7 @@
     sudo apt-get install devscripts \
                          equivs \
                          gsettings-desktop-schemas \
+                         gsettings-ubuntu-schemas \
                          qmenumodel-qml \
                          qtdeclarative5-dee-plugin \
                          qtdeclarative5-gsettings1.0 \

=== modified file 'debian/control'
--- debian/control	2014-03-24 11:49:06 +0000
+++ debian/control	2014-03-27 15:49:21 +0000
@@ -143,7 +143,8 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
+Depends: gsettings-ubuntu-schemas,
+         ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-launcher-impl,
           unity-launcher-impl-3,

=== modified file 'plugins/Powerd/CMakeLists.txt'
--- plugins/Powerd/CMakeLists.txt	2013-08-02 16:18:28 +0000
+++ plugins/Powerd/CMakeLists.txt	2014-03-27 15:49:21 +0000
@@ -1,4 +1,11 @@
 include(Plugins)
+include(FindPkgConfig)
+
+pkg_search_module(GIO REQUIRED gio-2.0)
+
+include_directories(
+    ${GIO_INCLUDE_DIRS}
+)
 
 add_definitions(-DSM_BUSNAME=systemBus)
 
@@ -8,6 +15,7 @@
     )
 
 qt5_use_modules(Powerd-qml DBus Qml)
+target_link_libraries(Powerd-qml ${GIO_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	2014-03-27 15:49:21 +0000
@@ -17,6 +17,13 @@
  */
 
 #include "Powerd.h"
+#include <QDBusPendingCall>
+
+void autoBrightnessChanged(GSettings *settings, const gchar *key, QDBusInterface *powerd)
+{
+    bool value = g_settings_get_boolean(settings, key);
+    powerd->asyncCall("userAutobrightnessEnable", QVariant(value));
+}
 
 Powerd::Powerd(QObject* parent)
   : QObject(parent),
@@ -33,4 +40,14 @@
                                  "DisplayPowerStateChange",
                                  this,
                                  SIGNAL(displayPowerStateChange(int, unsigned int)));
+
+    systemSettings = g_settings_new("com.ubuntu.touch.system");
+    g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), powerd);
+    autoBrightnessChanged(systemSettings, "auto-brightness", powerd);
+}
+
+Powerd::~Powerd()
+{
+    g_signal_handlers_disconnect_by_data(systemSettings, powerd);
+    g_object_unref(systemSettings);
 }

=== modified file 'plugins/Powerd/Powerd.h'
--- plugins/Powerd/Powerd.h	2013-08-21 20:04:24 +0000
+++ plugins/Powerd/Powerd.h	2014-03-27 15:49:21 +0000
@@ -20,6 +20,7 @@
 #ifndef UNITY_POWERD_H
 #define UNITY_POWERD_H
 
+#include <gio/gio.h>
 #include <QtCore/QObject>
 #include <QtDBus/QDBusInterface>
 
@@ -43,12 +44,14 @@
     };
 
     explicit Powerd(QObject *parent = 0);
+    ~Powerd();
 
 Q_SIGNALS:
     void displayPowerStateChange(int status, unsigned int flags);
 
 private:
     QDBusInterface *powerd;
+    GSettings *systemSettings;
 };
 
 #endif