Merge lp:~lukas-kde/unity8/sessionIndicatorForDevices into lp:unity8

[Lukáš Tinkl]

Session indicator convergence

Session indicator convergence

Enables the session indicator also on devices, tweaking/hiding some of the items that don't make sense there.

Cf. https://docs.google.com/spreadsheets/d/1coL7U4BrOMrK3op7y9TPmmLcBAlgtzoUcKIYrbFhQvU

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

https://code.launchpad.net/~mzanetti/unity8/better-windowed-logic/+merge/284731 and https://code.launchpad.net/~lukas-kde/indicator-session/desktopModeSwitch/+merge/288413

Also needs indicator-session to be installed by default on devices!

 * 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?

Yes

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

Yes, as per https://docs.google.com/spreadsheets/d/1coL7U4BrOMrK3op7y9TPmmLcBAlgtzoUcKIYrbFhQvU

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2219
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/661/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/376
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/376
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/376
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/867
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/883
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/883
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/881
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/881/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/881
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/881/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/881
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/881/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/881
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/881/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/881
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/881/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/881
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/881/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/661/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/sessionIndicatorForDevices]

2220. By Lukáš Tinkl on 2016-03-14

create our own unity8-schemas package

2221. By Lukáš Tinkl on 2016-03-14

merge prereq

Unmerged revisions

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2015-12-02 12:02:50 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-03-09 13:18:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2016 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
@@ -12,8 +12,6 @@
  *
  * 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: Nick Dedekind <[e-mail]>
  */
 
 #include "indicatorsmanager.h"
@@ -286,12 +284,12 @@
     new_indicator->init(data->m_fileInfo.fileName(), settings);
 
     // convergence:
-    // 1) enable session indicator conditionally, typically when running in a multisession/multiuser environment
+    // 1) enable session indicator
     // 2) on a PC, switch the battery/power indicator to desktop mode,
     //    can't control brightness for now and phone-on-desktop broken (FIXME)
     //
     // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
-    if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
+    if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
             || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
         new_indicator->setProfile("desktop");
     } else {

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2015-11-24 20:00:37 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2016-03-09 13:18:01 +0000
@@ -336,6 +336,9 @@
 
 void DBusUnitySessionService::Lock()
 {
+    // signal u8 to show the lockscreen/greeter
+    PromptLock();
+
     // lock the session using the org.freedesktop.DisplayManager system DBUS service
     const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
     QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
@@ -348,7 +351,7 @@
     connect(watcher, &QDBusPendingCallWatcher::finished,
         this, [this](QDBusPendingCallWatcher* watcher) {
 
-        QDBusPendingReply<QVariant> reply = *watcher;
+        QDBusPendingReply<void> reply = *watcher;
         watcher->deleteLater();
         if (reply.isError()) {
             qWarning() << "Lock call failed" << reply.error().message();

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2016-01-11 17:36:56 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2016-03-09 13:18:01 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Settings.Menus 0.1 as Menus
 import Ubuntu.Settings.Components 0.1
 import QMenuModel 0.1
@@ -22,6 +23,7 @@
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components 1.3
 import Unity.Session 0.1
+import Unity.Platform 1.0
 
 Item {
     id: menuFactory
@@ -61,9 +63,11 @@
 
             "com.canonical.indicator.calendar": calendarMenu,
             "com.canonical.indicator.location": timezoneMenu,
-
-            "indicator.user-menu-item": userMenuItem,
-            "indicator.guest-menu-item": userMenuItem
+        },
+        "indicator-session": {
+            "indicator.user-menu-item": Platform.isPC ? userMenuItem : null,
+            "indicator.guest-menu-item": Platform.isPC ? userMenuItem : null,
+            "com.canonical.indicator.switch": Screen.width >= units.gu(90) ? switchMenu : null // Desktop mode switch
         },
         "indicator-messages" : {
             "com.canonical.indicator.button"         : messagesButtonMenu
@@ -977,6 +981,15 @@
     }
 
     function load(modelData, context) {
+        // tweak indicator-session items
+        if (context === "indicator-session") {
+            if ((modelData.action === "indicator.logout" || modelData.action === "indicator.suspend" || modelData.action === "indicator.hibernate" ||
+                 modelData.action === "indicator.reboot")
+                    && !Platform.isPC) {
+                return null; // logout, suspend and hibernate hidden on devices
+            }
+        }
+
         if (modelData.type !== undefined && modelData.type !== "") {
             var component = undefined;
 

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-01-28 18:25:14 +0000
+++ qml/Shell.qml	2016-03-09 13:18:01 +0000
@@ -428,6 +428,11 @@
         }
     }
 
+    Connections {
+        target: DBusUnitySessionService
+        onLockRequested: lightDM.greeter.showGreeter()
+    }
+
     Timer {
         // See powerConnection for why this is useful
         id: showGreeterDelayed