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

[Michał Sawicz]

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/~unity-team/unity8/better-windowed-logic/+merge/288817 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)

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

FAILED: Continuous integration, rev:2219
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/687/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/905
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/921/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/921/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/919/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/919/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/919/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/919/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/919/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/919/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/OrientedShell.qml
1 conflicts encountered.

[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

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

FAILED: Continuous integration, rev:2220
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/727/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/955/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/971/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/971/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/969/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/969/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/969/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/969/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/969/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/969/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2221
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/728/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/407
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/407
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/407/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/956
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/972
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/972
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/970
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/970/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/970
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/970/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/970
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/970/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/970
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/970/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/970
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/970/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/970
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/970/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

+ Connections {
+ target: DBusUnitySessionService
+ onLockRequested: lightDM.greeter.showGreeter()
+ }

I think this would better fit in Greeter.qml. We try to consolidate all the greeter logic in there, so that it's more easily ignorable if we're running without a greeter (which some split greeter scenarios need).

+ PromptLock();

Huh... org.freedesktop.DisplayManager does not seem to emit a signal when we ask it to lock... I guess the intention was for lightdm to switch VTs. And then the desktop session would notice the vt switch? I'd have to check how we know to lock the session in such cases.

But I guess this is OK for now. We might have to confirm everything works as expected here in the split greeter branches though.

+ if ((new_indicator->identifier() == QStringLiteral("indicator-session"))

Can we not just drop that check and enable the correct profile for indicator-session? Does it still not have profile support? It would be more correct to fix that in the indicator than patch its menu items in unity8...

I haven't run this yet, this was just looking at code.

review: Needs Fixing

[Michael Terry (mterry)]

Oh, and as the autopilot test failure shows, you need Replaces & Breaks for unity8-schemas:

https://wiki.debian.org/PackageTransition

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-03-10 22:42:34 +0000
+++ debian/control	2016-03-14 12:52:43 +0000
@@ -135,6 +135,7 @@
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-10,
          unity8-fake-env | unity-application-impl,
+         unity8-schemas,
          ${misc:Depends},
 Breaks: unity8 (<< 7.86),
 Replaces: unity8 (<< 7.86),
@@ -210,3 +211,10 @@
 Depends: ${misc:Depends},
 Description: Documentation for Unity8
  The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)
+
+Package: unity8-schemas
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: GSettings schemas for Unity8
+ The Unity 8 shell is the primary user interface for Ubuntu devices.

=== modified file 'debian/unity8-common.install'
--- debian/unity8-common.install	2015-02-17 17:15:53 +0000
+++ debian/unity8-common.install	2016-03-14 12:52:43 +0000
@@ -1,4 +1,3 @@
-usr/share/glib-2.0/schemas
 usr/share/locale
 usr/share/unity8/Components
 usr/share/unity8/Dash

=== added file 'debian/unity8-schemas.install'
--- debian/unity8-schemas.install	1970-01-01 00:00:00 +0000
+++ debian/unity8-schemas.install	2016-03-14 12:52:43 +0000
@@ -0,0 +1,1 @@
+usr/share/glib-2.0/schemas

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-02-19 08:44:42 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-03-14 12:52:43 +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(QStringLiteral("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-14 12:52:43 +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-03-10 13:14:29 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2016-03-14 12:52:43 +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
@@ -976,6 +980,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-03-10 22:37:44 +0000
+++ qml/Shell.qml	2016-03-14 12:52:43 +0000
@@ -443,6 +443,11 @@
         }
     }
 
+    Connections {
+        target: DBusUnitySessionService
+        onLockRequested: lightDM.greeter.showGreeter()
+    }
+
     Timer {
         // See powerConnection for why this is useful
         id: showGreeterDelayed