Unity 8

Merge lp:~mterry/unity8/greeter-apps into lp:unity8

greeter-apps
Merge into trunk

Proposed by Michael Terry on 2016-07-08

Status:	Superseded
Proposed branch:	lp:~mterry/unity8/greeter-apps
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/greeter-focus
Diff against target:	1630 lines (+1080/-38) 37 files modified data/unity8-greeter-wrapper (+11/-3) debian/control (+3/-1) plugins/SessionBroadcast/SessionBroadcast.cpp (+36/-10) plugins/SessionBroadcast/SessionBroadcast.h (+10/-3) plugins/Unity/Indicators/indicatorsmanager.cpp (+3/-5) plugins/Utils/CMakeLists.txt (+1/-0) plugins/Utils/URLDispatcher.cpp (+77/-0) plugins/Utils/URLDispatcher.h (+47/-0) plugins/Utils/plugin.cpp (+2/-0) qml/Components/KeymapSwitcher.qml (+27/-1) qml/Greeter/Greeter.qml (+2/-2) qml/Panel/IndicatorItemRow.qml (+13/-2) qml/Panel/Indicators/MenuItemFactory.qml (+65/-0) qml/Shell.qml (+35/-10) tests/mocks/CMakeLists.txt (+1/-0) tests/mocks/SessionBroadcast/CMakeLists.txt (+8/-0) tests/mocks/SessionBroadcast/SessionBroadcast.cpp (+34/-0) tests/mocks/SessionBroadcast/SessionBroadcast.h (+39/-0) tests/mocks/SessionBroadcast/plugin.cpp (+31/-0) tests/mocks/SessionBroadcast/plugin.h (+32/-0) tests/mocks/SessionBroadcast/qmldir (+2/-0) tests/mocks/Unity/Indicators/IndicatorsModel.qml (+41/-1) tests/mocks/Utils/CMakeLists.txt (+1/-0) tests/mocks/Utils/URLDispatcher.cpp (+38/-0) tests/mocks/Utils/URLDispatcher.h (+47/-0) tests/mocks/Utils/plugin.cpp (+2/-0) tests/plugins/CMakeLists.txt (+1/-0) tests/plugins/SessionBroadcast/BroadcastServer.cpp (+33/-0) tests/plugins/SessionBroadcast/BroadcastServer.h (+40/-0) tests/plugins/SessionBroadcast/CMakeLists.txt (+45/-0) tests/plugins/SessionBroadcast/interfaces.xml (+18/-0) tests/plugins/SessionBroadcast/server.cpp (+37/-0) tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp (+111/-0) tests/plugins/Utils/CMakeLists.txt (+9/-0) tests/plugins/Utils/URLDispatcherTest.cpp (+78/-0) tests/qmltests/Panel/tst_IndicatorItemRow.qml (+25/-0) tests/qmltests/tst_Shell.qml (+75/-0)
To merge this branch:	bzr merge lp:~mterry/unity8/greeter-apps
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-07-08	Needs Fixing on 2016-07-19
Daniel d'Andrada (community)		2016-07-08	Approve on 2016-07-19
Review via email: mp+299550@code.launchpad.net

This proposal supersedes a proposal from 2016-06-29.

This proposal has been superseded by a proposal from 2016-07-20.

Commit Message

Support launching apps inside a unity8 session from the greeter and support emergency dialing inside the greeter.

Description of the Change

Testing instructions:

(You can test this on desktop just fine. But you won't see the emergency dialer functionality that way. And you'd have to be running unity8 as a session too. So easier to do it on the phone.)

- "citrain device-upgrade 55 XXXX" to install a backported yakkety lightdm and this MP to your phone.
- On your phone, "sudo apt install unity8-greeter unity-greeter-session-broadcast".
- On your phone, edit /etc/lightdm/lightdm.conf.d/90-phablet.conf to add "autologin-in-background=true"

Now reboot and try launching apps from the launcher and from indicators. When you unlock the phone, you should see that app.

Also try pressing the "Home" button on the launcher. It should go-to-home in the session.

Also try pressing the "Emergency Call" button and see how it launches the dialer-app.

After logging in and you press the power button, you get a mere lockscreen, which isn't suitable for testing this branch. If you go to the Settings indicator and press lock, you'll get a proper greeter which is suitable. You can tell whether you're in a lockscreen or the greeter because the greeter currently has less indicators (separate issue). You may see some odd behaviors/visuals here and there. Using a separate greeter is certainly not seamless yet. Working on it. But this MP is just about launching apps. Other issues will be fixed in due time.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No, except it needs a backported lightdm to test on the phone.

* 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?
I'm on that team.

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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-29: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2496
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1643/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2185/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2213/console

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-08:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-apps updated on 2016-07-14

2499. By Michael Terry on 2016-07-14: Merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-14:

FAILED: Continuous integration, rev:2499
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1724/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2274/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2302
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2208
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2208
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2208

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-14:

FAILED: Continuous integration, rev:2499
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1731/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2281/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2309
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2212
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2212
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2212

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-15:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-apps updated on 2016-07-15

2500. By Michael Terry on 2016-07-15: And unregister the url-dispatcher well-known dbus name if we are set inactive (shouldn't happen in real practice)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-15:

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

review: Approve (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-07-18:

Some minor stuff:

"""
+++ qml/Greeter/Greeter.qml 2016-07-08 13:49:07 +0000
@@ -99,7 +99,7 @@
}

     // Notify that the user has explicitly requested the given app through unity8 GUI.
- function notifyUserRequestedApp(appId) {
+ function notifyUserRequestedApp() {
         if (!active) {
             return;
         }
"""

Worth updating the documentation.

-----------------------

URLDispatcher::dispatchURL is a signal named like a method.

I suggest naming it urlRequested instead. Client dispatches a URL, service receives the URL request. From the service's point of view a URL has been requested.

----------------------

In Shell.qml:

"""
URLDispatcher {
    [...]
    function activateURL(url) {
        SessionBroadcast.requestUrlStart(AccountsService.user, url);
        greeter.notifyUserRequestedApp();
        panel.indicators.hide();
    }
}
"""

I think a more appropriate place for activateURL() would be next to activateApplication(), in Shell itself. At least for consistency sake as activateApplication() isn't inside Launcher.

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2016-07-18:

How does logging work when you have two unity8 instances running?

lp:~mterry/unity8/greeter-apps updated on 2016-07-18

2501. By Michael Terry on 2016-07-18: Address review comments
2502. By Michael Terry on 2016-07-18: Save dbus-session in /run/ again, in attempt to make dialer-app launching more reliable

Michael Terry (mterry) wrote on 2016-07-18:

I addressed your comments. Regarding logging, I'll just repeat here what I said on IRC for posterity:

The lightdm user logs to its home in /var/lib/lightdm/.cache/upstart/ -- but unity8 itself will log to /var/log/lightdm/seat0-greeter.log.

You also mentioned on IRC a problem launching the emergency dialer. I was able to reproduce once but then had problems. I made a stab at something that might help? But I'm curious how reproducable it is for you.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-18:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-apps updated on 2016-07-19

2503. By Michael Terry on 2016-07-19: Fix race with upstart socket

Michael Terry (mterry) wrote on 2016-07-19:

OK, try again Daniel. I think I fixed the race condition with upstart causing the emergency dialer from not appearing.

Daniel d'Andrada (dandrader) wrote on 2016-07-19:

Launching dialer does work now

Daniel d'Andrada (dandrader) wrote on 2016-07-19:

Tapping on application icons in the greeter launcher has no effect whatsoever.

review: Needs Fixing

Michael Terry (mterry) wrote on 2016-07-19:

Whoops, I left out an instruction: you also have to install unity-greeter-session-broadcast. I've updated the instructions above. Try that and it should fix it.

(This MP adds a Recommends for unity-greeter-session-broadcast, but citrain doesn't pull that in for you.)

Daniel d'Andrada (dandrader) wrote on 2016-07-19:

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

* Did CI run pass? If not, please explain why.
No. Unrelated qmluitest failures. The same failures appear in other MPs.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-19:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-apps updated on 2016-09-06

2504. By Michael Terry on 2016-07-20: Merge in keyboardIndicator, since we conflict
2505. By Michael Terry on 2016-07-20: Move new tst_Shell tests, to avoid conflict
2506. By Michael Terry on 2016-08-03: merge from parent
2507. By Michael Terry on 2016-08-11: Merge from trunk
2508. By Michael Terry on 2016-08-11: Merge session-chooser-gui
2509. By Michael Terry on 2016-08-29: Merge from session-chooser-gui
2510. By Michael Terry on 2016-09-06: Merge session-chooser-gui

Unmerged revisions

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:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'data/unity8-greeter-wrapper'
 --- data/unity8-greeter-wrapper	2016-06-14 17:53:56 +0000
 +++ data/unity8-greeter-wrapper	2016-07-20 13:18:38 +0000
@@ -1,8 +1,7 @@
  #!/bin/sh
  # -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
+ #
--# Copyright (C) 2011,2013 Canonical Ltd
--# Author: Michael Terry <michael.terry@canonical.com>
++# Copyright (C) 2011,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 the Free Software
@@ -42,6 +41,8 @@
  SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
  rm -f $SUB_SOCKET # clear socket in case we were hard shut down
++echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"
++
  # If touch session script (which sets up grid units and mir variables) is available, use it
  TOUCH_WRAPPER=
  if [ -x /usr/bin/ubuntu-touch-session ]; then
@@ -65,7 +66,14 @@
  MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &
  INIT_PID=$!
  while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
--export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
++. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"
++export UPSTART_SESSION
++
++# Connect upstart to system, but do first command in a loop to avoid any
++# race condition between the session file above being written and upstart being
++# ready to handle requests.
++while ! /sbin/initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done
++/sbin/initctl start notify-cgmanager
  # Start any pre-greeter tasks if needed (like wizard)
  /sbin/initctl emit unity8-greeter-starting
 === modified file 'debian/control'
 --- debian/control	2016-06-29 14:45:18 +0000
 +++ debian/control	2016-07-20 13:18:38 +0000
@@ -130,7 +130,9 @@
           unity8-private | unity-launcher-impl,
           ${misc:Depends},
           ${shlibs:Depends},
--Recommends: indicator-session,
++Recommends: indicator-keyboard,
++            indicator-session,
++            unity-greeter-session-broadcast,
              unity-scope-click,
              unity-scope-mediascanner2,
  Breaks: indicator-network (<< 0.5.1+14.10.20141014),
 === modified file 'plugins/SessionBroadcast/SessionBroadcast.cpp'
 --- plugins/SessionBroadcast/SessionBroadcast.cpp	2016-04-19 20:36:29 +0000
 +++ plugins/SessionBroadcast/SessionBroadcast.cpp	2016-07-20 13:18:38 +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,12 +12,12 @@
+  *
   * 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: Michael Terry <michael.terry@canonical.com>
   */
  #include "SessionBroadcast.h"
  #include <QDBusConnection>
++#include <QDBusConnectionInterface>
++#include <QDBusInterface>
  #include <glib.h>
@@ -27,13 +27,39 @@
      m_username = QString::fromUtf8(g_get_user_name());
      auto connection = QDBusConnection::SM_BUSNAME();
--
--    connection.connect(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
--                       QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
--                       QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
--                       QStringLiteral("ShowHome"),
--                       this,
--                       SLOT(onShowHome(const QString &)));
++    auto interface = connection.interface();
++    interface->startService(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"));
++
++    m_broadcaster = new QDBusInterface(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
++                                       QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
++                                       QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
++                                       connection, this);
++
++    connect(m_broadcaster, SIGNAL(StartUrl(const QString &, const QString &)),
++            this, SLOT(onStartUrl(const QString &, const QString &)));
++
++    connect(m_broadcaster, SIGNAL(ShowHome(const QString &)),
++            this, SLOT(onShowHome(const QString &)));
++}
++
++void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
++{
++    m_broadcaster->asyncCall(QStringLiteral("RequestUrlStart"), username, url);
++}
++
++void SessionBroadcast::requestHomeShown(const QString &username)
++{
++    m_broadcaster->asyncCall(QStringLiteral("RequestHomeShown"), username);
++}
++
++void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
++{
++    // Since this signal is just used for testing, we don't *really* care if
++    // username matches, but just in case we do eventually use the signal, we
++    // should only listen to our own requests.
++    if (username == m_username) {
++        Q_EMIT startUrl(url);
++    }
+ }
  void SessionBroadcast::onShowHome(const QString &username)
 === modified file 'plugins/SessionBroadcast/SessionBroadcast.h'
 --- plugins/SessionBroadcast/SessionBroadcast.h	2016-04-06 19:03:42 +0000
 +++ plugins/SessionBroadcast/SessionBroadcast.h	2016-07-20 13:18:38 +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/>.
-- *
-- * Authors: Michael Terry <michael.terry@canonical.com>
   */
  #ifndef UNITY_SESSIONBROADCAST_H
@@ -31,14 +29,23 @@
  public:
      explicit SessionBroadcast(QObject *parent = 0);
++    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
++    Q_INVOKABLE void requestHomeShown(const QString &username);
++
  Q_SIGNALS:
++    // This signal isn't actually used by the shell
++    // (unity-greeter-session-broadcast handles launching an app for us), but
++    // it's useful for testing the plugin.
++    void startUrl(const QString &url);
      void showHome();
  private Q_SLOTS:
++    void onStartUrl(const QString &username, const QString &url);
      void onShowHome(const QString &username);
  private:
      QString m_username;
++    QDBusInterface *m_broadcaster;
  };
  #endif
 === modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
 --- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-06-08 21:52:16 +0000
 +++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-07-20 13:18:38 +0000
@@ -114,10 +114,6 @@
      QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
      const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
--    if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
--        return; // convergence: skip this indicator until it works in Mir
--    }
--
      auto iter = m_indicatorsData.constFind(name);
      if (iter != m_indicatorsData.constEnd())
+     {
@@ -285,11 +281,13 @@
      // convergence:
      // 1) enable session indicator
--    // 2) on a PC, switch the battery/power indicator to desktop mode,
++    // 2) enable keyboard indicator
++    // 3) 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"))
++            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
              || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
          new_indicator->setProfile(m_profile.replace(QStringLiteral("phone"), QStringLiteral("desktop")));
      } else {
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2016-06-27 18:45:27 +0000
 +++ plugins/Utils/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -29,6 +29,7 @@
      inputeventgenerator.cpp
      deviceconfigparser.cpp
      globalfunctions.cpp
++    URLDispatcher.cpp
      plugin.cpp
+     )
 === added file 'plugins/Utils/URLDispatcher.cpp'
 --- plugins/Utils/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/URLDispatcher.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,77 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#include "URLDispatcher.h"
++
++#include <QDBusConnection>
++
++class URLDispatcherInterface : public QObject
++{
++    Q_OBJECT
++    Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
++
++public:
++    explicit URLDispatcherInterface(URLDispatcher *parent);
++
++    Q_SCRIPTABLE void DispatchURL(const QString &url, const QString &package);
++};
++
++URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
++  : QObject(parent)
++{
++}
++
++void URLDispatcherInterface::DispatchURL(const QString &url, const QString &package)
++{
++    Q_UNUSED(package);
++    Q_EMIT static_cast<URLDispatcher *>(parent())->urlRequested(url);
++}
++
++URLDispatcher::URLDispatcher(QObject *parent)
++  : QObject(parent)
++  , m_dispatcher(nullptr)
++{
++}
++
++bool URLDispatcher::active() const
++{
++    return m_dispatcher != nullptr;
++}
++
++void URLDispatcher::setActive(bool value)
++{
++    if (value == active())
++        return;
++
++    QDBusConnection connection = QDBusConnection::sessionBus();
++
++    if (value) {
++        URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
++        connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),
++                                  dispatcher,
++                                  QDBusConnection::ExportScriptableContents);
++        connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));
++        m_dispatcher = dispatcher;
++    } else {
++        connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));
++        delete m_dispatcher;
++        m_dispatcher = nullptr;
++    }
++
++    Q_EMIT activeChanged();
++}
++
++#include "URLDispatcher.moc"
 === added file 'plugins/Utils/URLDispatcher.h'
 --- plugins/Utils/URLDispatcher.h	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/URLDispatcher.h	2016-07-20 13:18:38 +0000
@@ -0,0 +1,47 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#ifndef UNITY_URLDISPATCHER_H
++#define UNITY_URLDISPATCHER_H
++
++#include <QObject>
++#include <QString>
++
++// This class manages our url-dispatcher interception.  We intercept
++// url-dispatcher because rather than spawning the handler for the URL
++// in our own session, we want to notify the user session to do it for us
++// (and start an unlock in the process).
++
++class URLDispatcher : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
++
++public:
++    explicit URLDispatcher(QObject *parent=0);
++
++    bool active() const;
++    void setActive(bool active);
++
++Q_SIGNALS:
++    void urlRequested(const QString &url);
++    void activeChanged();
++
++private:
++    QObject *m_dispatcher;
++};
++
++#endif
 === modified file 'plugins/Utils/plugin.cpp'
 --- plugins/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
 +++ plugins/Utils/plugin.cpp	2016-07-20 13:18:38 +0000
@@ -38,6 +38,7 @@
  #include "inputeventgenerator.h"
  #include "deviceconfigparser.h"
  #include "globalfunctions.h"
++#include "URLDispatcher.h"
  static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
@@ -80,4 +81,5 @@
      qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
      qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
      qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
++    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
+ }
 === modified file 'qml/Components/KeymapSwitcher.qml'
 --- qml/Components/KeymapSwitcher.qml	2016-04-04 13:38:56 +0000
 +++ qml/Components/KeymapSwitcher.qml	2016-07-20 13:18:38 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.4
  import AccountsService 0.1
  import GlobalShortcut 1.0
++import QMenuModel 0.1
  import Unity.Application 0.1
  QtObject {
@@ -36,7 +37,8 @@
      readonly property var keymaps: AccountsService.keymaps
      readonly property int keymapCount: keymaps.length
--    property int currentKeymapIndex: 0
++    // default keymap, either the one remembered by the indicator, or the 1st one selected by user
++    property int currentKeymapIndex: actionGroup.currentAction.valid ? actionGroup.currentAction.state : 0
      readonly property string currentKeymap: keymaps[currentKeymapIndex]
      function nextKeymap() {
@@ -62,4 +64,28 @@
          property: "keymap"
          value: root.currentKeymap
+     }
++
++    // indicator
++    property QDBusActionGroup actionGroup: QDBusActionGroup {
++        busType: DBus.SessionBus
++        busName: "com.canonical.indicator.keyboard"
++        objectPath: "/com/canonical/indicator/keyboard"
++
++        property variant currentAction: action("current")
++        property variant activeAction: action("active")
++
++        Component.onCompleted: actionGroup.start();
++    }
++
++    onCurrentKeymapIndexChanged: {
++        actionGroup.currentAction.updateState(currentKeymapIndex);
++    }
++
++    readonly property int activeActionState: actionGroup.activeAction.valid ? actionGroup.activeAction.state : -1
++
++    onActiveActionStateChanged: {
++        if (activeActionState != -1) {
++            currentKeymapIndex = activeActionState;
++        }
++    }
+ }
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2016-07-07 19:52:57 +0000
 +++ qml/Greeter/Greeter.qml	2016-07-20 13:18:38 +0000
@@ -98,8 +98,8 @@
+         }
+     }
--    // Notify that the user has explicitly requested the given app through unity8 GUI.
--    function notifyUserRequestedApp(appId) {
++    // Notify that the user has explicitly requested an app
++    function notifyUserRequestedApp() {
          if (!active) {
              return;
+         }
 === modified file 'qml/Panel/IndicatorItemRow.qml'
 --- qml/Panel/IndicatorItemRow.qml	2016-03-29 03:47:39 +0000
 +++ qml/Panel/IndicatorItemRow.qml	2016-07-20 13:18:38 +0000
@@ -18,6 +18,10 @@
  import QtQuick.Window 2.2
  import Ubuntu.Components 1.3
++// for indicator-keyboard
++import AccountsService 0.1
++import Unity.InputInfo 0.1
++
  Item {
      id: root
      width: row.width
@@ -127,6 +131,11 @@
          property bool forceAlignmentAnimationDisabled: false
+     }
++    InputDeviceModel {
++        id: keyboardsModel
++        deviceFilter: InputInfo.Keyboard
++    }
++
      onCurrentItemChanged: {
          if (d.previousItem) {
              d.firstItemSwitch = false;
@@ -184,9 +193,11 @@
                  property int ownIndex: index
                  property bool overflow: row.width - x > overFlowWidth
--                property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator)
++                property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
                  // HACK for indicator-session
                  readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
++                // HACK for indicator-keyboard
++                readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && (AccountsService.keymaps.length < 2 || keyboardsModel.count == 0)
                  height: row.height
                  expanded: root.expanded
@@ -202,7 +213,7 @@
                      NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing }
+                 }
--                width: ((expanded || indicatorVisible) && !hideSessionIndicator) ? implicitWidth : 0
++                width: ((expanded || indicatorVisible) && !hideSessionIndicator && !hideKeyboardIndicator) ? implicitWidth : 0
                  Behavior on width {
                      NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing }
 === modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
 --- qml/Panel/Indicators/MenuItemFactory.qml	2016-05-20 08:43:45 +0000
 +++ qml/Panel/Indicators/MenuItemFactory.qml	2016-07-20 13:18:38 +0000
@@ -985,6 +985,62 @@
+         }
+     }
++    Component {
++        id: keymapMenu;
++
++        // FIXME this should use a "radio button" menu, once we have it in the SDK
++        ListItems.Empty {
++            id: checkItem
++            objectName: "keymapMenu"
++            property QtObject menuData: null
++            property int menuIndex: -1
++            readonly property bool serverChecked: menuData && menuData.isToggled || false
++
++            enabled: menuData && menuData.sensitive || false
++            highlightWhenPressed: false
++            __acceptEvents: !serverChecked
++
++            CheckBox {
++                id: checkbox
++                __acceptEvents: !checkItem.serverChecked
++                anchors {
++                    left: parent.left
++                    leftMargin: checkItem.__contentsMargins
++                    verticalCenter: parent.verticalCenter
++                }
++            }
++
++            ServerPropertySynchroniser {
++                objectName: "sync"
++                syncTimeout: Utils.Constants.indicatorValueTimeout
++
++                serverTarget: checkItem
++                serverProperty: "serverChecked"
++                userTarget: checkbox
++                userProperty: "checked"
++
++                onSyncTriggered: {
++                    menuModel.activate(checkItem.menuIndex);
++                }
++            }
++
++            Label {
++                id: label
++                anchors {
++                    left: checkbox.right
++                    leftMargin: checkItem.__contentsMargins
++                    right: parent.right
++                    rightMargin: checkItem.__contentsMargins
++                    verticalCenter: parent.verticalCenter
++                }
++                elide: Text.ElideRight
++                text: checkItem.menuData && checkItem.menuData.label || ""
++            }
++
++            onClicked: menuModel.activate(menuIndex);
++        }
++    }
++
      function load(modelData, context) {
          // tweak indicator-session items
          if (context === "indicator-session") {
@@ -995,6 +1051,15 @@
+             }
+         }
++        // specialize for indicator-keyboard
++        if (context === "indicator-keyboard") {
++            if (modelData.isRadio) {
++                return keymapMenu;
++            } else if (modelData.action === "indicator.map" || modelData.action === "indicator.chart") {
++                return null; // map and chart not available
++            }
++        }
++
          if (modelData.type !== undefined && modelData.type !== "") {
              var component = undefined;
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-07-11 17:23:38 +0000
 +++ qml/Shell.qml	2016-07-20 13:18:38 +0000
@@ -151,6 +151,22 @@
      readonly property alias greeter: greeterLoader.item
      function activateApplication(appId) {
++        // Either open the app in our own session, or -- if we're acting as a
++        // greeter -- ask the user's session to open it for us.
++        if (shell.mode === "greeter") {
++            activateURL("application:///" + appId + ".desktop");
++        } else {
++            startApp(appId);
++        }
++    }
++
++    function activateURL(url) {
++        SessionBroadcast.requestUrlStart(AccountsService.user, url);
++        greeter.notifyUserRequestedApp();
++        panel.indicators.hide();
++    }
++
++    function startApp(appId) {
          if (ApplicationManager.findApplication(appId)) {
              ApplicationManager.requestFocusApplication(appId);
          } else {
@@ -162,7 +178,7 @@
          if (greeter.locked) {
              greeter.lockedApp = app;
+         }
--        shell.activateApplication(app);
++        startApp(app); // locked apps are always in our same session
+     }
      Binding {
@@ -259,9 +275,7 @@
                                             ? "phone"
                                             : shell.usageScenario
              readonly property string qmlComponent: {
--                if (shell.mode === "greeter") {
--                    return "Stages/AbstractStage.qml"
--                } else if (applicationsDisplayLoader.usageScenario === "phone") {
++                if (applicationsDisplayLoader.usageScenario === "phone") {
                      return "Stages/PhoneStage.qml";
                  } else if (applicationsDisplayLoader.usageScenario === "tablet") {
                      return "Stages/TabletStage.qml";
@@ -499,11 +513,15 @@
+     }
      function showHome() {
--        greeter.notifyUserRequestedApp("unity8-dash");
++        greeter.notifyUserRequestedApp();
--        var animate = !LightDMService.greeter.active && !stages.shown
--        dash.setCurrentScope(0, animate, false)
--        ApplicationManager.requestFocusApplication("unity8-dash")
++        if (shell.mode === "greeter") {
++            SessionBroadcast.requestHomeShown(AccountsService.user);
++        } else {
++            var animate = !LightDMService.greeter.active && !stages.shown;
++            dash.setCurrentScope(0, animate, false);
++            ApplicationManager.requestFocusApplication("unity8-dash");
++        }
+     }
      function showDash() {
@@ -599,7 +617,7 @@
+                 }
+             }
              onLauncherApplicationSelected: {
--                greeter.notifyUserRequestedApp(appId);
++                greeter.notifyUserRequestedApp();
                  shell.activateApplication(appId);
+             }
              onShownChanged: {
@@ -745,7 +763,14 @@
      Connections {
          target: SessionBroadcast
--        onShowHome: showHome()
++        onShowHome: if (shell.mode !== "greeter") showHome()
++    }
++
++    URLDispatcher {
++        id: urlDispatcher
++        objectName: "urlDispatcher"
++        active: shell.mode === "greeter"
++        onUrlRequested: shell.activateURL(url)
+     }
      ItemGrabber {
 === modified file 'tests/mocks/CMakeLists.txt'
 --- tests/mocks/CMakeLists.txt	2016-06-27 14:51:40 +0000
 +++ tests/mocks/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -39,6 +39,7 @@
  add_subdirectory(MeeGo)
  add_subdirectory(Powerd)
  add_subdirectory(QMenuModel)
++add_subdirectory(SessionBroadcast)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(QtMultimedia)
 === added directory 'tests/mocks/SessionBroadcast'
 === added file 'tests/mocks/SessionBroadcast/CMakeLists.txt'
 --- tests/mocks/SessionBroadcast/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionBroadcast/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -0,0 +1,8 @@
++add_library(MockSessionBroadcast-qml MODULE
++    plugin.cpp
++    SessionBroadcast.cpp
++    )
++
++qt5_use_modules(MockSessionBroadcast-qml Qml)
++
++add_unity8_mock(SessionBroadcast 0.1 SessionBroadcast TARGETS MockSessionBroadcast-qml)
 === added file 'tests/mocks/SessionBroadcast/SessionBroadcast.cpp'
 --- tests/mocks/SessionBroadcast/SessionBroadcast.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionBroadcast/SessionBroadcast.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#include "SessionBroadcast.h"
++
++SessionBroadcast::SessionBroadcast(QObject* parent)
++  : QObject(parent)
++{
++}
++
++void SessionBroadcast::requestUrlStart(const QString &, const QString &url)
++{
++    // No user name guards, we won't worry about that aspect of the plugin here
++    Q_EMIT startUrl(url);
++}
++
++void SessionBroadcast::requestHomeShown(const QString &)
++{
++    // No user name guards, we won't worry about that aspect of the plugin here
++    Q_EMIT showHome();
++}
 === added file 'tests/mocks/SessionBroadcast/SessionBroadcast.h'
 --- tests/mocks/SessionBroadcast/SessionBroadcast.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionBroadcast/SessionBroadcast.h	2016-07-20 13:18:38 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright (C) 2012,2013 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/>.
++ *
++ * Authors: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_MOCK_SESSIONBROADCAST_H
++#define UNITY_MOCK_SESSIONBROADCAST_H
++
++#include <QObject>
++
++class SessionBroadcast: public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit SessionBroadcast(QObject *parent = 0);
++
++    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
++    Q_INVOKABLE void requestHomeShown(const QString &username);
++
++Q_SIGNALS:
++    void startUrl(const QString &url);
++    void showHome();
++};
++
++#endif
 === added file 'tests/mocks/SessionBroadcast/plugin.cpp'
 --- tests/mocks/SessionBroadcast/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionBroadcast/plugin.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,31 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#include "plugin.h"
++#include "SessionBroadcast.h"
++
++#include <QtQml/qqml.h>
++
++static QObject *broadcast_provider(QQmlEngine *, QJSEngine *)
++{
++    return new SessionBroadcast();
++}
++
++void PowerdPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("SessionBroadcast"));
++    qmlRegisterSingletonType<SessionBroadcast>(uri, 0, 1, "SessionBroadcast", broadcast_provider);
++}
 === added file 'tests/mocks/SessionBroadcast/plugin.h'
 --- tests/mocks/SessionBroadcast/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionBroadcast/plugin.h	2016-07-20 13:18:38 +0000
@@ -0,0 +1,32 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#ifndef MOCK_SESSIONBROADCAST_PLUGIN_H
++#define MOCK_SESSIONBROADCAST_PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class PowerdPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri) override;
++};
++
++#endif
 === added file 'tests/mocks/SessionBroadcast/qmldir'
 --- tests/mocks/SessionBroadcast/qmldir	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionBroadcast/qmldir	2016-07-20 13:18:38 +0000
@@ -0,0 +1,2 @@
++module SessionBroadcast
++plugin MockSessionBroadcast-qml
 === modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
 --- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2015-07-15 15:07:19 +0000
 +++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2016-07-20 13:18:38 +0000
@@ -16,12 +16,23 @@
  import QtQuick 2.4
  import Unity.Indicators 0.1 as Indicators
++import Unity.InputInfo 0.1
++import AccountsService 0.1
  Indicators.FakeIndicatorsModel {
      id: root
      property var originalModelData: [
+         {
++            "identifier": "indicator-keyboard",
++            "indicatorProperties": {
++                "enabled": true,
++                "busName": "com.canonical.indicators.fake0",
++                "menuObjectPath": "/com/canonical/indicators/fake0",
++                "actionsObjectPath": "/com/canonical/indicators/fake0"
++            }
++        },
++        {
              "identifier": "fake-indicator-bluetooth",
              "indicatorProperties": {
                  "enabled": true,
@@ -74,13 +85,38 @@
                  "menuObjectPath": "/com/canonical/indicators/fake6",
                  "actionsObjectPath": "/com/canonical/indicators/fake6"
+             }
++        },
++        {
++            "identifier": "fake-indicator-session",
++            "indicatorProperties": {
++                "enabled": true,
++                "busName": "com.canonical.indicators.fake7",
++                "menuObjectPath": "/com/canonical/indicators/fake7",
++                "actionsObjectPath": "/com/canonical/indicators/fake7"
++            }
+         }
+     ]
++    Component.onCompleted: {
++        // init data for the fake indicator-keyboard
++        MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
++        AccountsService.keymaps = ["us", "cs"];
++    }
++
++    Component.onDestruction: {
++        MockInputDeviceBackend.removeDevice("/kbd0");
++        AccountsService.keymaps = ["us"];
++    }
++
      function load(profile) {
          unload();
          root.modelData = originalModelData;
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake0",
++                                           getUnityMenuModelData("indicator-keyboard",
++                                                                 "Czech (F)",
++                                                                 "",
++                                                                 [ "image://theme/indicator-keyboard-Cs-1" ]));
          Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake1",
                                             getUnityMenuModelData("fake-indicator-bluetooth",
                                                                   "Bluetooth (F)",
@@ -111,6 +147,11 @@
                                                                   "Upcoming Events (F)",
                                                                   "12:04",
                                                                   []));
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake7",
++                                           getUnityMenuModelData("fake-indicator-session",
++                                                                 "System (F)",
++                                                                 "",
++                                                                 ["image://theme/system-devices-panel"]));
+     }
      function getUnityMenuModelData(identifier, title, label, icons) {
@@ -173,6 +214,5 @@
                  break;
+             }
+         }
--
+     }
+ }
 === modified file 'tests/mocks/Utils/CMakeLists.txt'
 --- tests/mocks/Utils/CMakeLists.txt	2016-06-02 09:32:33 +0000
 +++ tests/mocks/Utils/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -32,6 +32,7 @@
      constants.cpp
      plugin.cpp
      windowstatestorage.cpp
++    URLDispatcher.cpp
+     )
  add_library(FakeUtils-qml SHARED
 === added file 'tests/mocks/Utils/URLDispatcher.cpp'
 --- tests/mocks/Utils/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Utils/URLDispatcher.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,38 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#include "URLDispatcher.h"
++
++#include <QDBusConnection>
++
++URLDispatcher::URLDispatcher(QObject *parent)
++  : QObject(parent)
++  , m_active(false)
++{
++}
++
++bool URLDispatcher::active() const
++{
++    return m_active;
++}
++
++void URLDispatcher::setActive(bool value)
++{
++    if (m_active != value) {
++        m_active = value;
++        Q_EMIT activeChanged();
++    }
++}
 === added file 'tests/mocks/Utils/URLDispatcher.h'
 --- tests/mocks/Utils/URLDispatcher.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Utils/URLDispatcher.h	2016-07-20 13:18:38 +0000
@@ -0,0 +1,47 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#ifndef UNITY_URLDISPATCHER_H
++#define UNITY_URLDISPATCHER_H
++
++#include <QObject>
++#include <QString>
++
++// This class manages our url-dispatcher interception.  We intercept
++// url-dispatcher because rather than spawning the handler for the URL
++// in our own session, we want to notify the user session to do it for us
++// (and start an unlock in the process).
++
++class URLDispatcher : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
++
++public:
++    explicit URLDispatcher(QObject *parent=0);
++
++    bool active() const;
++    void setActive(bool active);
++
++Q_SIGNALS:
++    void urlRequested(const QString &url);
++    void activeChanged();
++
++private:
++    bool m_active;
++};
++
++#endif
 === modified file 'tests/mocks/Utils/plugin.cpp'
 --- tests/mocks/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
 +++ tests/mocks/Utils/plugin.cpp	2016-07-20 13:18:38 +0000
@@ -25,6 +25,7 @@
  #include "plugin.h"
  #include "windowstatestorage.h"
  #include "constants.h"
++#include "URLDispatcher.h"
  // plugin
  #include <activefocuslogger.h>
@@ -80,4 +81,5 @@
      qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
      qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
      qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
++    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
+ }
 === modified file 'tests/plugins/CMakeLists.txt'
 --- tests/plugins/CMakeLists.txt	2016-06-07 16:10:36 +0000
 +++ tests/plugins/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -4,6 +4,7 @@
  add_subdirectory(GlobalShortcut)
  add_subdirectory(Greeter)
  add_subdirectory(LightDM)
++add_subdirectory(SessionBroadcast)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(Utils)
 === added directory 'tests/plugins/SessionBroadcast'
 === added file 'tests/plugins/SessionBroadcast/BroadcastServer.cpp'
 --- tests/plugins/SessionBroadcast/BroadcastServer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionBroadcast/BroadcastServer.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ */
++
++#include "BroadcastServer.h"
++
++BroadcastServer::BroadcastServer(QObject *parent)
++    : QObject(parent)
++{
++}
++
++void BroadcastServer::RequestUrlStart(const QString &username, const QString &url)
++{
++    Q_EMIT StartUrl(username, url);
++}
++
++void BroadcastServer::RequestHomeShown(const QString &username)
++{
++    Q_EMIT ShowHome(username);
++}
 === added file 'tests/plugins/SessionBroadcast/BroadcastServer.h'
 --- tests/plugins/SessionBroadcast/BroadcastServer.h	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionBroadcast/BroadcastServer.h	2016-07-20 13:18:38 +0000
@@ -0,0 +1,40 @@
++/*
++ * Copyright 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ */
++
++#ifndef UNITY_BROADCASTSERVER_H
++#define UNITY_BROADCASTSERVER_H
++
++#include <QDBusContext>
++#include <QObject>
++
++class BroadcastServer: public QObject, protected QDBusContext
++{
++    Q_OBJECT
++
++public:
++    explicit BroadcastServer(QObject *parent = nullptr);
++
++public Q_SLOTS:
++    void RequestUrlStart(const QString &username, const QString &url);
++    void RequestHomeShown(const QString &username);
++
++Q_SIGNALS:
++    void StartUrl(const QString &username, const QString &url);
++    void ShowHome(const QString &username);
++};
++
++#endif
 === added file 'tests/plugins/SessionBroadcast/CMakeLists.txt'
 --- tests/plugins/SessionBroadcast/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionBroadcast/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -0,0 +1,45 @@
++macro(make_dbus_class NAME INTERFACE)
++    if(${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor.h)
++        execute_process(COMMAND ${QDBUSXML2CPP_EXECUTABLE} -c ${NAME}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})
++    endif()
++endmacro(make_dbus_class)
++
++make_dbus_class(Broadcast com.canonical.Unity.Greeter.Broadcast)
++
++add_definitions(-DSM_BUSNAME=sessionBus)
++
++include_directories(
++    ${GLIB_INCLUDE_DIRS}
++    ${CMAKE_CURRENT_BINARY_DIR}
++    ${CMAKE_CURRENT_SOURCE_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast
++)
++
++link_libraries(
++    ${GLIB_LIBRARIES}
++)
++
++add_executable(MockBroadcastServer
++    ${CMAKE_CURRENT_BINARY_DIR}/BroadcastAdaptor.cpp
++    server.cpp
++    BroadcastServer.cpp
++)
++qt5_use_modules(MockBroadcastServer Core DBus)
++
++### SessionBroadcastTest
++add_executable(sessionbroadcasttestExec
++    ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast/SessionBroadcast.cpp
++    sessionbroadcasttest.cpp
++)
++qt5_use_modules(sessionbroadcasttestExec Test Core Qml DBus)
++
++add_unity8_unittest(SessionBroadcast dbus-test-runner
++    ARG_PREFIX "--parameter"
++    ARGS
++        --task $<TARGET_FILE:MockBroadcastServer>
++        --task-name server
++        --ignore-return
++        --task $<TARGET_FILE:sessionbroadcasttestExec>
++        --task-name client
++        --wait-for com.canonical.Unity.Greeter.Broadcast
++)
 === added file 'tests/plugins/SessionBroadcast/interfaces.xml'
 --- tests/plugins/SessionBroadcast/interfaces.xml	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionBroadcast/interfaces.xml	2016-07-20 13:18:38 +0000
@@ -0,0 +1,18 @@
++<node>
++  <interface name="com.canonical.Unity.Greeter.Broadcast">
++    <method name="RequestUrlStart">
++      <arg name="username" type="s" direction="in" />
++      <arg name="url" type="s" direction="in" />
++    </method>
++    <method name="RequestHomeShown">
++      <arg name="username" type="s" direction="in" />
++    </method>
++    <signal name="StartUrl">
++      <arg name="username" type="s" direction="out" />
++      <arg name="url" type="s" direction="out" />
++    </signal>
++    <signal name="ShowHome">
++      <arg name="username" type="s" direction="out" />
++    </signal>
++  </interface>
++</node>
 === added file 'tests/plugins/SessionBroadcast/server.cpp'
 --- tests/plugins/SessionBroadcast/server.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionBroadcast/server.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ */
++
++#include "BroadcastAdaptor.h"
++#include "BroadcastServer.h"
++#include <QCoreApplication>
++
++int main(int argc, char *argv[])
++{
++    QCoreApplication a(argc, argv);
++
++    auto broadcast = new BroadcastServer(&a);
++    new BroadcastAdaptor(broadcast);
++
++    // We use the session bus for testing.  The real plugin uses the system bus
++    auto connection = QDBusConnection::sessionBus();
++    if (!connection.registerObject("/com/canonical/Unity/Greeter/Broadcast", broadcast))
++        return 1;
++    if (!connection.registerService("com.canonical.Unity.Greeter.Broadcast"))
++        return 1;
++
++    return a.exec();
++}
 === added file 'tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp'
 --- tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,111 @@
++/*
++ * Copyright 2016 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/>.
++ */
++
++#include <QtTest>
++#include <QDBusInterface>
++#include <QSignalSpy>
++
++#include <glib.h>
++
++#include "SessionBroadcast.h"
++
++class SessionBroadcastTest : public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++
++    void initTestCase() {
++        broadcastServer = new QDBusInterface("com.canonical.Unity.Greeter.Broadcast",
++                                             "/com/canonical/Unity/Greeter/Broadcast",
++                                             "com.canonical.Unity.Greeter.Broadcast",
++                                             QDBusConnection::sessionBus(), this);
++        serverStartUrlSpy = new QSignalSpy(broadcastServer,
++                                           SIGNAL(StartUrl(const QString &, const QString &)));
++        serverShowHomeSpy = new QSignalSpy(broadcastServer,
++                                           SIGNAL(ShowHome(const QString &)));
++        user = QString(g_get_user_name());
++        otherUser = user + "2";
++    }
++
++    void init()
++    {
++        serverStartUrlSpy->clear();
++        serverShowHomeSpy->clear();
++
++        broadcastPlugin = new SessionBroadcast(this);
++        pluginStartUrlSpy = new QSignalSpy(broadcastPlugin,
++                                           SIGNAL(startUrl(const QString &)));
++        pluginShowHomeSpy = new QSignalSpy(broadcastPlugin,
++                                           SIGNAL(showHome()));
++    }
++
++    void cleanup()
++    {
++        delete broadcastPlugin;
++    }
++
++    void testReceiveUrlStart() {
++        broadcastServer->call("RequestUrlStart", user, "test:");
++        QTRY_COMPARE(serverStartUrlSpy->count(), 1);
++        QCOMPARE(pluginStartUrlSpy->count(), 1);
++        QCOMPARE((*pluginStartUrlSpy)[0][0], QVariant("test:"));
++    }
++
++    void testReceiveUrlStartOtherUser() {
++        broadcastServer->call("RequestUrlStart", otherUser, "test:");
++        QTRY_COMPARE(serverStartUrlSpy->count(), 1);
++        QCOMPARE(pluginStartUrlSpy->count(), 0);
++    }
++
++    void testReceiveShowHome() {
++        broadcastServer->call("RequestHomeShown", user);
++        QTRY_COMPARE(serverShowHomeSpy->count(), 1);
++        QCOMPARE(pluginShowHomeSpy->count(), 1);
++    }
++
++    void testReceiveShowHomeOtherUser() {
++        broadcastServer->call("RequestHomeShown", otherUser);
++        QTRY_COMPARE(serverShowHomeSpy->count(), 1);
++        QCOMPARE(pluginShowHomeSpy->count(), 0);
++    }
++
++    void testSendUrlStart() {
++        broadcastPlugin->requestUrlStart(otherUser, "test:");
++        QTRY_COMPARE(serverStartUrlSpy->count(), 1);
++        QCOMPARE((*serverStartUrlSpy)[0][0], QVariant(otherUser));
++        QCOMPARE((*serverStartUrlSpy)[0][1], QVariant("test:"));
++    }
++
++    void testSendShowHome() {
++        broadcastPlugin->requestHomeShown(otherUser);
++        QTRY_COMPARE(serverShowHomeSpy->count(), 1);
++        QCOMPARE((*serverShowHomeSpy)[0][0], QVariant(otherUser));
++    }
++
++private:
++    QDBusInterface *broadcastServer;
++    SessionBroadcast *broadcastPlugin;
++    QSignalSpy *serverStartUrlSpy;
++    QSignalSpy *serverShowHomeSpy;
++    QSignalSpy *pluginStartUrlSpy;
++    QSignalSpy *pluginShowHomeSpy;
++    QString user;
++    QString otherUser;
++};
++
++QTEST_GUILESS_MAIN(SessionBroadcastTest)
++#include "sessionbroadcasttest.moc"
 === modified file 'tests/plugins/Utils/CMakeLists.txt'
 --- tests/plugins/Utils/CMakeLists.txt	2016-02-18 16:53:54 +0000
 +++ tests/plugins/Utils/CMakeLists.txt	2016-07-20 13:18:38 +0000
@@ -23,3 +23,12 @@
  # plain qml test
  add_unity8_qmlunittest(. UtilsStyle)
++
++# URLDispatcher test needs dbus-test-runner because it claims a dbus name
++add_executable(URLDispatcherTestExec URLDispatcherTest.cpp)
++qt5_use_modules(URLDispatcherTestExec Test Core Qml)
++target_link_libraries(URLDispatcherTestExec Utils-qml)
++add_unity8_unittest(URLDispatcher dbus-test-runner
++    ARG_PREFIX "--parameter"
++    ARGS --task $<TARGET_FILE:URLDispatcherTestExec>
++)
 === added file 'tests/plugins/Utils/URLDispatcherTest.cpp'
 --- tests/plugins/Utils/URLDispatcherTest.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Utils/URLDispatcherTest.cpp	2016-07-20 13:18:38 +0000
@@ -0,0 +1,78 @@
++/*
++ * Copyright (C) 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
++ * 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/>.
++ */
++
++#include "URLDispatcher.h"
++
++#include <QDBusInterface>
++#include <QSignalSpy>
++#include <QTest>
++
++class URLDispatcherTest : public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++
++    void initTestCase() {
++        dispatchServer = new QDBusInterface("com.canonical.URLDispatcher",
++                                            "/com/canonical/URLDispatcher",
++                                            "com.canonical.URLDispatcher",
++                                            QDBusConnection::sessionBus(), this);
++    }
++
++    void init()
++    {
++        dispatcher = new URLDispatcher(this);
++        dispatchSpy = new QSignalSpy(dispatcher,
++                                     SIGNAL(urlRequested(const QString &)));
++    }
++
++    void cleanup()
++    {
++        delete dispatcher;
++    }
++
++    void testInactiveByDefault() {
++        QVERIFY(!dispatcher->active());
++    }
++
++    void testActiveRequest() {
++        dispatcher->setActive(true);
++        dispatchServer->call("DispatchURL", "test:", "package");
++        QCOMPARE(dispatchSpy->count(), 1);
++        QCOMPARE((*dispatchSpy)[0][0], QVariant("test:"));
++    }
++
++    void testInactiveRequest() {
++        dispatchServer->call("DispatchURL", "test:", "package");
++        QCOMPARE(dispatchSpy->count(), 0);
++    }
++
++    void testInactiveAfterActiveRequest() {
++        dispatcher->setActive(true);
++        dispatcher->setActive(false);
++        dispatchServer->call("DispatchURL", "test:", "package");
++        QCOMPARE(dispatchSpy->count(), 0);
++    }
++
++private:
++    QDBusInterface *dispatchServer;
++    URLDispatcher *dispatcher;
++    QSignalSpy *dispatchSpy;
++};
++
++QTEST_GUILESS_MAIN(URLDispatcherTest)
++#include "URLDispatcherTest.moc"
 === modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
 --- tests/qmltests/Panel/tst_IndicatorItemRow.qml	2016-03-29 03:47:39 +0000
 +++ tests/qmltests/Panel/tst_IndicatorItemRow.qml	2016-07-20 13:18:38 +0000
@@ -21,6 +21,8 @@
  import Ubuntu.Components 1.3
  import Unity.Test 0.1 as UT
  import Unity.Indicators 0.1 as Indicators
++import AccountsService 0.1
++import Unity.InputInfo 0.1
  IndicatorTest {
      id: root
@@ -285,5 +287,28 @@
              // should go back to 0
              tryCompare(findChild(indicatorsRow, "highlight"), "highlightCenterOffset", 0);
+         }
++
++        function test_hidingKeyboardIndicator_data() {
++            return [
++                { tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
++                { tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
++                { tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
++                { tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: true },
++                { tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: true },
++                { tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
++            ];
++        }
++
++        function test_hidingKeyboardIndicator(data) {
++            var item = findChild(indicatorsRow, "indicator-keyboard-panelItem");
++            AccountsService.keymaps = data.keymaps;
++            if (data.keyboard) {
++                MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
++            } else {
++                MockInputDeviceBackend.removeDevice("/kbd0");
++            }
++
++            compare(item.hidden, data.hidden);
++        }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-07-06 19:45:19 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-07-20 13:18:38 +0000
@@ -19,6 +19,7 @@
  import AccountsService 0.1
  import GSettings 1.0
  import LightDM.IntegratedLightDM 0.1 as LightDM
++import SessionBroadcast 0.1
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3 as ListItem
  import Ubuntu.Telephony 0.1 as Telephony
@@ -406,6 +407,18 @@
+     }
      SignalSpy {
++        id: broadcastUrlSpy
++        target: SessionBroadcast
++        signalName: "startUrl"
++    }
++
++    SignalSpy {
++        id: broadcastHomeSpy
++        target: SessionBroadcast
++        signalName: "showHome"
++    }
++
++    SignalSpy {
          id: unlockAllModemsSpy
          target: Connectivity
          signalName: "unlockingAllModems"
@@ -546,6 +559,8 @@
              LightDM.Greeter.authenticate(""); // reset greeter
              sessionSpy.clear();
++            broadcastUrlSpy.clear();
++            broadcastHomeSpy.clear();
              GSettingsController.setLifecycleExemptAppids([]);
@@ -2404,6 +2419,66 @@
              compare(topmostSurfaceItem.touchReleaseCount, 2);
+         }
++        function test_greeterModeBroadcastsApp() {
++            setLightDMMockMode("single-pin");
++            shellLoader.mode = "greeter";
++            loadShell("phone");
++            shell.usageScenario = "phone";
++            waitForRendering(shell);
++
++            dragLauncherIntoView();
++            var appIcon = findChild(shell, "launcherDelegate0")
++            tap(appIcon);
++
++            tryCompare(broadcastUrlSpy, "count", 1);
++            compare(broadcastUrlSpy.signalArguments[0][0], "application:///" + appIcon.appId + ".desktop");
++            compare(ApplicationManager.count, 1); // confirm only dash is open, we didn't start new app
++
++            var coverPage = findChild(shell, "coverPage");
++            tryCompare(coverPage, "showProgress", 0);
++        }
++
++        function test_greeterModeBroadcastsHome() {
++            setLightDMMockMode("single-pin");
++            shellLoader.mode = "greeter";
++            loadShell("phone");
++            shell.usageScenario = "phone";
++            waitForRendering(shell);
++
++            var gallerySurfaceId = topLevelSurfaceList.nextId;
++            var galleryApp = ApplicationManager.startApplication("gallery-app");
++            waitUntilAppWindowIsFullyLoaded(gallerySurfaceId);
++            compare(ApplicationManager.focusedApplicationId, "gallery-app");
++
++            dragLauncherIntoView();
++            tap(findChild(shell, "buttonShowDashHome"));
++
++            tryCompare(broadcastHomeSpy, "count", 1);
++            compare(ApplicationManager.focusedApplicationId, "gallery-app"); // confirm we didn't focus dash
++
++            var coverPage = findChild(shell, "coverPage");
++            tryCompare(coverPage, "showProgress", 0);
++        }
++
++        function test_greeterModeDispatchesURL() {
++            setLightDMMockMode("single-pin");
++            shellLoader.mode = "greeter";
++            loadShell("phone");
++            shell.usageScenario = "phone";
++            waitForRendering(shell);
++
++            var urlDispatcher = findInvisibleChild(shell, "urlDispatcher");
++            verify(urlDispatcher.active);
++            urlDispatcher.urlRequested("test:"); // force signal emission
++
++            tryCompare(broadcastUrlSpy, "count", 1);
++            compare(broadcastUrlSpy.signalArguments[0][0], "test:");
++            compare(ApplicationManager.count, 1); // confirm only dash is open, we didn't start new app
++
++            var coverPage = findChild(shell, "coverPage");
++            tryCompare(coverPage, "showProgress", 0);
++        }
++
          function test_switchKeymap() {
              // start with phone shell
              loadShell("phone");