Unity 8

Merge lp:~renatofilho/unity8/blue-led into lp:unity8

blue-led
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-06-27

Status:	Merged
Approved by:	Michael Zanetti on 2014-07-03
Approved revision:	1002
Merged at revision:	1008
Proposed branch:	lp:~renatofilho/unity8/blue-led
Merge into:	lp:unity8
Diff against target:	483 lines (+397/-0) 11 files modified debian/control (+2/-0) debian/unity8-private.install (+1/-0) plugins/CMakeLists.txt (+1/-0) plugins/Lights/CMakeLists.txt (+18/-0) plugins/Lights/Lights.cpp (+182/-0) plugins/Lights/Lights.h (+75/-0) plugins/Lights/plugin.cpp (+35/-0) plugins/Lights/plugin.h (+34/-0) plugins/Lights/qmldir (+3/-0) qml/Panel/Indicators/DefaultIndicatorWidget.qml (+8/-0) qml/Panel/Indicators/IndicatorsLight.qml (+38/-0)
To merge this branch:	bzr merge lp:~renatofilho/unity8/blue-led
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-03
Michael Zanetti (community)		2014-06-27	Approve on 2014-07-03
Review via email: mp+224899@code.launchpad.net

Commit Message

Create IndicatorsLight.qml component used to control indicator led.

A blue led will pulse if the message indicator is blue and screen is off.

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? NO

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

* Did you make sure that your branch does not contain spurious tags? YES

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP? NO PACKAGE CHANGE

* If you changed the UI, has there been a design review? NO UI CHANGE

PS Jenkins bot (ps-jenkins) wrote on 2014-06-28:

FAILED: Continuous integration, rev:997
http://jenkins.qa.ubuntu.com/job/unity8-ci/3259/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/353/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/353/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/353/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2221/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-06-28:

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2014-07-02:

Looks quite good. See some inline comments. Also please add the checklist [1] to the description and fill it in.

[1] https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

review: Needs Fixing

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-02:

* Are there any related MPs required for this MP to build/function as expected? NO

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

* Did you make sure that your branch does not contain spurious tags? YES

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP? NO PACKAGE CHANGE

* If you changed the UI, has there been a design review? NO UI CHANGE

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2014-07-02:

There's one last header we missed. See inline comment.

I guess the color of the light kinda counts as a UX change, so I think we should ask design for an opinion on the color.

As discussed on IRC, it'd be cool to have a color property of the class to allow setting the color easily in QML.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03:

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2014-07-03:

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

Yes. works fine

* Did CI run pass? If not, please explain why.

it did

review: Approve

Michael Zanetti (mzanetti) wrote on 2014-07-03:

sorry, there's still plugin.h's copyright header out of date.

review: Needs Fixing

lp:~renatofilho/unity8/blue-led updated on 2014-07-03

1002. By Renato Araujo Oliveira Filho on 2014-07-03: Updated plugin.h license header.

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-07-03:

> sorry, there's still plugin.h's copyright header out of date.
Fixed

Michael Zanetti (mzanetti) on 2014-07-03:

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03:

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

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) on 2014-07-03:

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Renato Araujo Oliveira Filho

Unity Team

 === modified file 'debian/control'
 --- debian/control	2014-06-27 08:28:18 +0000
 +++ debian/control	2014-07-03 12:35:52 +0000
@@ -13,6 +13,7 @@
                 libgles2-mesa-dev[armhf],
                 libglib2.0-dev,
                 libgsettings-qt-dev,
++               libhardware-dev,
                 libhud-client2-dev,
                 libpulse-dev,
                 libqmenumodel-dev (>= 0.2.7),
@@ -159,6 +160,7 @@
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends},
  Depends: gsettings-ubuntu-schemas,
++         libhardware2,
           libunity-core-6.0-9,
           ${misc:Depends},
           ${shlibs:Depends},
 === modified file 'debian/unity8-private.install'
 --- debian/unity8-private.install	2014-06-11 15:36:51 +0000
 +++ debian/unity8-private.install	2014-07-03 12:35:52 +0000
@@ -2,6 +2,7 @@
  usr/lib/*/unity8/qml/Dash
  usr/lib/*/unity8/qml/HudClient
  usr/lib/*/unity8/qml/LightDM
++usr/lib/*/unity8/qml/Lights
  usr/lib/*/unity8/qml/Powerd
  usr/lib/*/unity8/qml/SessionBroadcast
  usr/lib/*/unity8/qml/Ubuntu
 === modified file 'plugins/CMakeLists.txt'
 --- plugins/CMakeLists.txt	2014-06-11 15:36:51 +0000
 +++ plugins/CMakeLists.txt	2014-07-03 12:35:52 +0000
@@ -14,6 +14,7 @@
  add_subdirectory(AccountsService)
  add_subdirectory(HudClient)
  add_subdirectory(LightDM)
++add_subdirectory(Lights)
  add_subdirectory(Dash)
  add_subdirectory(Powerd)
  add_subdirectory(SessionBroadcast)
 === added directory 'plugins/Lights'
 === added file 'plugins/Lights/CMakeLists.txt'
 --- plugins/Lights/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/Lights/CMakeLists.txt	2014-07-03 12:35:52 +0000
@@ -0,0 +1,18 @@
++include(FindPkgConfig)
++
++pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
++pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
++
++include_directories(
++    ${ANDROID_HEADERS_INCLUDE_DIRS}
++)
++
++add_library(Lights-qml MODULE
++    plugin.cpp
++    Lights.cpp
++    )
++
++qt5_use_modules(Lights-qml Qml Gui)
++target_link_libraries(Lights-qml ${ANDROID_HARDWARE_LIBRARIES})
++
++add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
 === added file 'plugins/Lights/Lights.cpp'
 --- plugins/Lights/Lights.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Lights/Lights.cpp	2014-07-03 12:35:52 +0000
@@ -0,0 +1,182 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
++ */
++
++#include "Lights.h"
++#include <QtCore/QDebug>
++
++extern "C" {
++#include <hardware/hardware.h>
++#include <hardware/lights.h>
++#include <string.h>
++}
++
++Lights::Lights(QObject* parent)
++  : QObject(parent),
++    m_lightDevice(0),
++    m_color("blue"),
++    m_state(Lights::Off),
++    m_onMs(1000),
++    m_offMs(3000)
++{
++}
++
++Lights::~Lights()
++{
++    if (m_lightDevice) {
++        hw_device_t* device = (hw_device_t*) m_lightDevice;
++        device->close(device);
++    }
++}
++
++void Lights::setState(Lights::State newState)
++{
++    if (m_state != newState) {
++        if (newState == Lights::On) {
++            turnOn();
++        } else {
++            turnOff();
++        }
++    }
++}
++
++Lights::State Lights::state() const
++{
++    return m_state;
++}
++
++void Lights::setColor(const QColor &color)
++{
++    if (m_color != color) {
++        m_color = color;
++        Q_EMIT colorChanged(m_color);
++        // FIXME: update the collor if the light is already on
++    }
++}
++
++QColor Lights::color() const
++{
++    return m_color;
++}
++
++int Lights::onMillisec() const
++{
++    return m_onMs;
++}
++
++void Lights::setOnMillisec(int onMs)
++{
++    if (m_onMs != onMs) {
++        m_onMs = onMs;
++        Q_EMIT onMillisecChanged(m_onMs);
++        // FIXME: update the property if the light is already on
++    }
++}
++
++int Lights::offMillisec() const
++{
++    return m_offMs;
++}
++
++void Lights::setOffMillisec(int offMs)
++{
++    if (m_offMs != offMs) {
++        m_offMs = offMs;
++        Q_EMIT offMillisecChanged(m_offMs);
++        // FIXME: update the property if the light is already on
++    }
++}
++
++bool Lights::init()
++{
++    if (m_lightDevice) {
++        return true;
++    }
++
++    int err;
++    hw_module_t* module;
++
++    err = hw_get_module(LIGHTS_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
++    if (err == 0) {
++        hw_device_t* device;
++        err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
++        if (err == 0) {
++            m_lightDevice = (light_device_t*)device;
++            return true;
++        } else {
++            qWarning() << "Failed to access notification lights";
++        }
++    } else {
++        qWarning() << "Failed to initialize lights hardware.";
++    }
++    return false;
++}
++
++void Lights::turnOn()
++{
++    if (!init()) {
++        qWarning() << "No lights device";
++        return;
++    }
++
++    if (m_state == Lights::On) {
++        return;
++    }
++
++    // pulse
++    light_state_t state;
++    memset(&state, 0, sizeof(light_state_t));
++    state.color = m_color.rgba();
++    state.flashMode = LIGHT_FLASH_TIMED;
++    state.flashOnMS = m_onMs;
++    state.flashOffMS = m_offMs;
++    state.brightnessMode = BRIGHTNESS_MODE_USER;
++
++    if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
++         qWarning() << "Failed to turn the light off";
++    } else {
++        m_state = Lights::On;
++        Q_EMIT stateChanged(m_state);
++    }
++}
++
++void Lights::turnOff()
++{
++    if (!init()) {
++        qWarning() << "No lights device";
++        return;
++    }
++
++    if (m_state == Lights::Off) {
++        return;
++    }
++
++    light_state_t state;
++    memset(&state, 0, sizeof(light_state_t));
++    state.color = 0x00000000;
++    state.flashMode = LIGHT_FLASH_NONE;
++    state.flashOnMS = 0;
++    state.flashOffMS = 0;
++    state.brightnessMode = 0;
++
++    if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
++        qWarning() << "Failed to turn the light off";
++    } else {
++        m_state = Lights::Off;
++        Q_EMIT stateChanged(m_state);
++    }
++}
 === added file 'plugins/Lights/Lights.h'
 --- plugins/Lights/Lights.h	1970-01-01 00:00:00 +0000
 +++ plugins/Lights/Lights.h	2014-07-03 12:35:52 +0000
@@ -0,0 +1,75 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
++ */
++
++#ifndef UNITY_LIGHTS_H
++#define UNITY_LIGHTS_H
++
++#include <QtCore/QObject>
++#include <QtGui/QColor>
++
++struct light_device_t;
++
++class Lights: public QObject
++{
++    Q_OBJECT
++    Q_ENUMS(State)
++    Q_PROPERTY(State state READ state  WRITE setState NOTIFY stateChanged)
++    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
++    Q_PROPERTY(int onMillisec READ onMillisec WRITE setOnMillisec NOTIFY onMillisecChanged)
++    Q_PROPERTY(int offMillisec READ offMillisec WRITE setOffMillisec NOTIFY offMillisecChanged)
++
++public:
++    enum State {
++        Off,
++        On,
++    };
++
++    explicit Lights(QObject *parent = 0);
++    ~Lights();
++
++    void setState(State newState);
++    State state() const;
++
++    void setColor(const QColor &color);
++    QColor color() const;
++
++    int onMillisec() const;
++    void setOnMillisec(int onMs);
++
++    int offMillisec() const;
++    void setOffMillisec(int offMs);
++
++Q_SIGNALS:
++    void stateChanged(State newState);
++    void colorChanged(const QColor &color);
++    void onMillisecChanged(int onMs);
++    void offMillisecChanged(int offMs);
++
++private:
++    light_device_t* m_lightDevice;
++    QColor m_color;
++    State m_state;
++    int m_onMs;
++    int m_offMs;
++
++    bool init();
++    void turnOff();
++    void turnOn();
++};
++
++#endif
 === added file 'plugins/Lights/plugin.cpp'
 --- plugins/Lights/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Lights/plugin.cpp	2014-07-03 12:35:52 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
++ */
++
++#include "plugin.h"
++#include "Lights.h"
++
++#include <QtQml/qqml.h>
++
++static QObject *lights_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new Lights();
++}
++
++void LightsPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("Lights"));
++    qmlRegisterSingletonType<Lights>(uri, 0, 1, "Lights", lights_provider);
++}
 === added file 'plugins/Lights/plugin.h'
 --- plugins/Lights/plugin.h	1970-01-01 00:00:00 +0000
 +++ plugins/Lights/plugin.h	2014-07-03 12:35:52 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
++ */
++
++#ifndef LIGHTS_PLUGIN_H
++#define LIGHTS_PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class LightsPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++};
++
++#endif
 === added file 'plugins/Lights/qmldir'
 --- plugins/Lights/qmldir	1970-01-01 00:00:00 +0000
 +++ plugins/Lights/qmldir	2014-07-03 12:35:52 +0000
@@ -0,0 +1,3 @@
++module Lights
++plugin Lights-qml
++typeinfo Lights.qmltypes
 === modified file 'qml/Panel/Indicators/DefaultIndicatorWidget.qml'
 --- qml/Panel/Indicators/DefaultIndicatorWidget.qml	2013-12-12 09:55:17 +0000
 +++ qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-07-03 12:35:52 +0000
@@ -32,6 +32,14 @@
      width: itemRow.width
      enabled: false
++    // FIXME: For now we will enable led indicator support only for messaging indicator
++    // in the future we should export a led API insted of doing that,
++    Loader {
++        id: indicatorLed
++        // only load source Component if the icons contains the new message icon
++        source: (indicatorWidget.icons && (String(indicatorWidget.icons).indexOf("indicator-messages-new") != -1)) ? Qt.resolvedUrl("IndicatorsLight.qml") : ""
++    }
++
      Row {
          id: itemRow
          width: childrenRect.width
 === added file 'qml/Panel/Indicators/IndicatorsLight.qml'
 --- qml/Panel/Indicators/IndicatorsLight.qml	1970-01-01 00:00:00 +0000
 +++ qml/Panel/Indicators/IndicatorsLight.qml	2014-07-03 12:35:52 +0000
@@ -0,0 +1,38 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors:
++ *      Renato Araujo Oliveira Filho <renato@canonical.com>
++ */
++
++import QtQuick 2.0
++import Powerd 0.1
++import Lights 0.1
++
++QtObject {
++    id: root
++
++    Component.onDestruction: Lights.state = Lights.Off
++
++    // QtObject does not have children
++    property var _connections: Connections {
++        id: powerConnection
++
++        target: Powerd
++        onDisplayPowerStateChange: {
++            Lights.state = (status === Powerd.Off) ? Lights.On : Lights.Off
++        }
++    }
++}