Merge lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2272 into lp:unity8

[Michał Sawicz]

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-10 14:46:09 +0000
+++ CMakeLists.txt	2017-01-25 16:04:08 +0000
@@ -70,7 +70,7 @@
 find_package(Qt5Concurrent 5.6 REQUIRED)
 find_package(Qt5Sql 5.6 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=25)
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 
=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2016-06-07 13:25:58 +0000
+++ cmake/modules/QmlTest.cmake	2017-01-25 16:04:08 +0000
@@ -264,12 +264,16 @@
 # installed system.
 
 function(add_meta_test TARGET_NAME)
-    cmake_parse_arguments(TEST "" "" "DEPENDS" ${ARGN})
+    cmake_parse_arguments(TEST "SERIAL" "" "DEPENDS" ${ARGN})
 
     add_custom_target(${TARGET_NAME})
 
     set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
-    file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
+    if(TEST_SERIAL)
+        file(WRITE "${filename}" "#!/bin/sh\n\n")
+    else()
+        file(WRITE "${filename}" "#!/usr/bin/parallel --shebang --no-notice\n\n")
+    endif()
 
     add_meta_dependencies(${TARGET_NAME} DEPENDS ${TEST_DEPENDS})
     # else we will write the rest of the script as we add cmake targets
@@ -307,6 +311,7 @@
     foreach(ONE_CMD ${TEST_COMMAND})
         set(script "${script}'${ONE_CMD}' ")
     endforeach()
+    set(script "${script}\"\$@\"") # Allow passing arguments if desired
 
     set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${TARGET_NAME}.sh")
 
@@ -370,7 +375,7 @@
         # add depend to the meta test script that we will install on system
         set(filename "${CMAKE_BINARY_DIR}/tests/scripts/${UPSTREAM_TARGET}.sh")
         if (EXISTS "${filename}")
-            file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh\n")
+            file(APPEND "${filename}" "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}/tests/scripts/${depend}.sh \"\$@\" 2>&1\n")
         endif()
     endforeach()
 endfunction()
 
=== modified file 'data/com.canonical.Unity8.gschema.xml'
--- data/com.canonical.Unity8.gschema.xml	2016-11-30 10:32:23 +0000
+++ data/com.canonical.Unity8.gschema.xml	2017-01-25 16:04:08 +0000
@@ -53,6 +53,11 @@
       <summary>Enable or disable the indicator pull down menus</summary>
       <description>Toggle the availability of the indicator pull down menus</description>
     </key>
+    <key type="s" name="appstore-uri">
+      <default>'scope://com.canonical.scopes.clickstore'</default>
+      <summary>The uri to the app store</summary>
+      <description>This will be used whenever the user triggers an action to open the app store.</description>
+    </key>
   </schema>
 
   <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-01-10 14:48:43 +0000
+++ debian/changelog	2017-01-25 16:04:08 +0000
@@ -1,3 +1,54 @@
+unity8 (8.15+17.04.20170124-0ubuntu1) zesty; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Limit tab-focus travelling on dialogs with a fence
+  * Restore focus to where it was when our ShellDialogs get unloaded
+  * Update current session after changing the user
+  * Add keyboard navigation for Indicators
+  * a window -> the current window
+  * There's no spreadDelegate_ anymore
+
+  [ Daniel d'Andrada ]
+  * Simplify DecoratedWindow
+  * Remove unnecessary warning message
+
+  [ Josh Arenson ]
+  * Add a test for the session chooser icon in the greeter's sessions
+    list
+
+  [ Lukáš Tinkl ]
+  * Fix keymap not being applied on the shell itself (LP: #1626435)
+  * Shell dialog improvements (kbd focus, mouse eater)
+  * Start searching directly as you type, w/o having to first
+    focus/click the search field.
+  * Add a test for the real implementation of WindowStateStorage
+  * Use a four finger gesture to open the drawer, much like in u7
+
+  [ Michael Terry ]
+  * Simplify the lightdm mock to make future greeter improvements easier
+    to test.
+  * Add support for guest sessions in unity8-greeter.
+  * Use a model for PAM prompts, supporting more possible interactions.
+  * Fix grouping of autopkg output and allow optionally passing
+    arguments to installed test scripts.
+  * Add support for LightDM hints for manual logins and hiding normal
+    users.
+
+  [ Michael Zanetti ]
+  * hint the launcher to indicate a successful size change to the user
+    (LP: #1646457)
+  * Improvements for the appdrawer (LP: #1648173)
+  * Adjust home key to still focus the dash instead of messing with the
+    drawer
+  * allow 4 finger simulation with mousetouchadaptor
+
+  [ Nick Dedekind ]
+  * Added Alt+F10 shortcut to open app menus. (LP: #1656896)
+  * Fixed menu layout width calculations. (LP: #1657050)
+  * Skip Panel::test_drag_indicator_item_down_shows_menu
+
+ -- Michał Sawicz <[e-mail]>  Tue, 24 Jan 2017 07:46:58 +0000
+
 unity8 (8.15+17.04.20170110.4-0ubuntu1) zesty; urgency=medium
 
   [ Albert Astals Cid ]
 
=== modified file 'debian/control'
--- debian/control	2017-01-10 14:46:09 +0000
+++ debian/control	2017-01-25 16:04:08 +0000
@@ -38,7 +38,7 @@
                libubuntugestures5-private-dev (>= 1.3.2030),
                libudev-dev,
                libudm-common-dev,
-               libunity-api-dev (>= 8.0),
+               libunity-api-dev (>= 8.1),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!arm64 !armhf],
 
=== modified file 'debian/rules'
--- debian/rules	2017-01-03 14:02:23 +0000
+++ debian/rules	2017-01-25 16:04:08 +0000
@@ -40,4 +40,4 @@
 override_dh_shlibdeps:
 	# Some mock libraries link against liblightdm-qt5-3.so which we want to
 	# avoid, since we only really link against our mock one, not the system one.
-	dh_shlibdeps -XlibMockLightDM-qml.so -XlibMockAccountsService-qml.so -Lunity8-private
+	dh_shlibdeps -XlibMockAccountsService-qml.so -Lunity8-private
 
=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2016-03-02 02:54:30 +0000
+++ plugins/LightDM/CMakeLists.txt	2017-01-25 16:04:08 +0000
@@ -7,7 +7,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
     ${libunity8-private_SOURCE_DIR}
     ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
 )
@@ -18,6 +17,7 @@
     DBusGreeterList.cpp
     Greeter.cpp
     plugin.cpp
+    PromptsModel.cpp
     SessionsModel.cpp
     UsersModel.cpp
     )
 
=== modified file 'plugins/LightDM/DBusGreeterList.cpp'
--- plugins/LightDM/DBusGreeterList.cpp	2015-10-01 23:54:24 +0000
+++ plugins/LightDM/DBusGreeterList.cpp	2017-01-25 16:04:08 +0000
@@ -25,7 +25,7 @@
    m_greeter(greeter)
 {
     connect(m_greeter, &Greeter::authenticationUserChanged, this, &DBusGreeterList::authenticationUserChangedHandler);
-    connect(m_greeter, &Greeter::promptlessChanged, this, &DBusGreeterList::promptlessChangedHandler);
+    connect(m_greeter, &Greeter::isAuthenticatedChanged, this, &DBusGreeterList::authenticatedChangedHandler);
 }
 
 QString DBusGreeterList::GetActiveEntry() const
@@ -40,16 +40,16 @@
 
 bool DBusGreeterList::entryIsLocked() const
 {
-    return !m_greeter->promptless();
+    return !m_greeter->isAuthenticated();
 }
 
-void DBusGreeterList::authenticationUserChangedHandler(const QString &user)
+void DBusGreeterList::authenticationUserChangedHandler()
 {
-    notifyPropertyChanged(QStringLiteral("ActiveEntry"), user);
-    Q_EMIT EntrySelected(user);
+    notifyPropertyChanged(QStringLiteral("ActiveEntry"), m_greeter->authenticationUser());
+    Q_EMIT EntrySelected(m_greeter->authenticationUser());
 }
 
-void DBusGreeterList::promptlessChangedHandler()
+void DBusGreeterList::authenticatedChangedHandler()
 {
     notifyPropertyChanged(QStringLiteral("EntryIsLocked"), entryIsLocked());
     Q_EMIT entryIsLockedChanged();
 
=== modified file 'plugins/LightDM/DBusGreeterList.h'
--- plugins/LightDM/DBusGreeterList.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/DBusGreeterList.h	2017-01-25 16:04:08 +0000
@@ -47,8 +47,8 @@
     void entryIsLockedChanged();
 
 private Q_SLOTS:
-    void authenticationUserChangedHandler(const QString &user);
-    void promptlessChangedHandler();
+    void authenticationUserChangedHandler();
+    void authenticatedChangedHandler();
 
 private:
     Greeter *m_greeter;
 
=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2016-07-28 15:34:29 +0000
+++ plugins/LightDM/Greeter.cpp	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -17,13 +17,16 @@
 
 #include "Greeter.h"
 #include "GreeterPrivate.h"
+#include <QCoreApplication>
 #include <libintl.h>
 
+static Greeter *singleton = nullptr;
+
 GreeterPrivate::GreeterPrivate(Greeter* parent)
   : m_greeter(new QLightDM::Greeter(parent)),
     m_active(false),
-    wasPrompted(false),
-    promptless(false),
+    responded(false),
+    everResponded(false),
     q_ptr(parent)
 {
 }
@@ -41,9 +44,32 @@
     connect(d->m_greeter, &QLightDM::Greeter::authenticationComplete,
             this, &Greeter::authenticationCompleteFilter);
 
+    // Don't get stuck waiting for PAM as we shut down.
+    connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
+            d->m_greeter, &QLightDM::Greeter::cancelAuthentication);
+
     d->m_greeter->connectSync();
 }
 
+Greeter::~Greeter()
+{
+    singleton = nullptr;
+}
+
+Greeter *Greeter::instance()
+{
+    if (!singleton) {
+        singleton = new Greeter;
+    }
+    return singleton;
+}
+
+PromptsModel *Greeter::promptsModel()
+{
+    Q_D(Greeter);
+    return &d->prompts;
+}
+
 bool Greeter::isActive() const
 {
     Q_D(const Greeter);
@@ -68,7 +94,16 @@
 QString Greeter::authenticationUser() const
 {
     Q_D(const Greeter);
-    return d->m_greeter->authenticationUser();
+    return d->cachedAuthUser;
+}
+
+void Greeter::checkAuthenticationUser()
+{
+    Q_D(Greeter);
+    if (d->cachedAuthUser != d->m_greeter->authenticationUser()) {
+        d->cachedAuthUser = d->m_greeter->authenticationUser();
+        Q_EMIT authenticationUserChanged();
+    }
 }
 
 QString Greeter::defaultSessionHint() const
@@ -77,35 +112,64 @@
     return d->m_greeter->defaultSessionHint();
 }
 
-bool Greeter::promptless() const
-{
-    Q_D(const Greeter);
-    return d->promptless;
-}
-
 QString Greeter::selectUser() const
 {
     Q_D(const Greeter);
-    return d->m_greeter->selectUserHint();
+    if (hasGuestAccount() && d->m_greeter->selectGuestHint()) {
+        return QStringLiteral("*guest");
+    } else {
+        return d->m_greeter->selectUserHint();
+    }
+}
+
+bool Greeter::hasGuestAccount() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->hasGuestAccountHint();
+}
+
+bool Greeter::showManualLoginHint() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->showManualLoginHint();
+}
+
+bool Greeter::hideUsersHint() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->hideUsersHint();
 }
 
 void Greeter::authenticate(const QString &username)
 {
     Q_D(Greeter);
-    d->wasPrompted = false;
-    if (d->promptless) {
-        d->promptless = false;
-        Q_EMIT promptlessChanged();
-    }
-
-    d->m_greeter->authenticate(username);
+    d->prompts.clear();
+    d->responded = false;
+    d->everResponded = false;
+
+    if (authenticationUser() == username) {
+        d->prompts = d->leftovers;
+    }
+    d->leftovers.clear();
+
+    if (username == QStringLiteral("*guest")) {
+        d->m_greeter->authenticateAsGuest();
+    } else if (username == QStringLiteral("*other")) {
+        d->m_greeter->authenticate(nullptr);
+    } else {
+        d->m_greeter->authenticate(username);
+    }
+
+    Q_EMIT authenticationStarted();
     Q_EMIT isAuthenticatedChanged();
-    Q_EMIT authenticationUserChanged(username);
+    checkAuthenticationUser();
 }
 
 void Greeter::respond(const QString &response)
 {
     Q_D(Greeter);
+    d->responded = true;
+    d->everResponded = true;
     d->m_greeter->respond(response);
 }
 
@@ -118,32 +182,82 @@
 void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type)
 {
     Q_D(Greeter);
-    d->wasPrompted = true;
+
+    checkAuthenticationUser(); // may have changed in liblightdm
 
     bool isDefaultPrompt = (text == dgettext("Linux-PAM", "Password: "));
+    bool isSecret = type == QLightDM::Greeter::PromptTypeSecret;
+
+    QString trimmedText;
+    if (!isDefaultPrompt)
+        trimmedText = text.trimmed();
 
     // Strip prompt of any colons at the end
-    QString trimmedText = text.trimmed();
     if (trimmedText.endsWith(':') || trimmedText.endsWith(QStringLiteral("："))) {
         trimmedText.chop(1);
     }
 
-    Q_EMIT showPrompt(trimmedText, type == QLightDM::Greeter::PromptTypeSecret, isDefaultPrompt);
+    if (trimmedText == "login") {
+        // 'login' is provided untranslated by LightDM when asking for a manual
+        // login username.
+        trimmedText = gettext("Username");
+    }
+
+    if (d->responded) {
+        d->prompts.clear();
+        d->responded = false;
+    }
+
+    d->prompts.append(trimmedText, isSecret ? PromptsModel::Secret : PromptsModel::Question);
 }
 
 void Greeter::showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type)
 {
-    Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);
+    Q_D(Greeter);
+
+    checkAuthenticationUser(); // may have changed in liblightdm
+
+    bool isError = type == QLightDM::Greeter::MessageTypeError;
+
+    if (d->responded) {
+        d->prompts.clear();
+        d->responded = false;
+    }
+    d->prompts.append(text, isError? PromptsModel::Error : PromptsModel::Message);
 }
 
 void Greeter::authenticationCompleteFilter()
 {
     Q_D(Greeter);
-    if (!d->wasPrompted) {
-        d->promptless = true;
-        Q_EMIT promptlessChanged();
-    }
 
     Q_EMIT isAuthenticatedChanged();
-    Q_EMIT authenticationComplete();
+
+    bool automatic = !d->everResponded;
+    bool pamHasLeftoverMessages = !d->prompts.hasPrompt() && d->prompts.rowCount() > 0;
+
+    if (!isAuthenticated()) {
+        if (pamHasLeftoverMessages) {
+            d->leftovers = d->prompts; // Prefer PAM's messages
+        } else if (automatic) {
+            d->leftovers.append(gettext("Failed to authenticate"), PromptsModel::Error);
+        } else {
+            d->leftovers.append(gettext("Invalid password, please try again"), PromptsModel::Error);
+        }
+    } else if (pamHasLeftoverMessages) {
+        automatic = true; // treat this successful login as automatic, so user sees message
+        d->leftovers = d->prompts;
+    }
+
+    if (automatic) {
+        d->prompts = d->leftovers; // OK, we'll just use these now
+        d->leftovers.clear();
+        d->prompts.append(isAuthenticated() ? gettext("Log In") : gettext("Retry"),
+                          PromptsModel::Button);
+    }
+
+    if (isAuthenticated()) {
+        Q_EMIT loginSuccess(automatic);
+    } else {
+        Q_EMIT loginError(automatic);
+    }
 }
 
=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2016-07-28 15:34:29 +0000
+++ plugins/LightDM/Greeter.h	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013,2015 Canonical, Ltd.
+ * Copyright (C) 2012-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
@@ -21,13 +21,13 @@
    such edits in the future, and by inserting ourselves here, we have more
    control. */
 
-#ifndef UNITY_GREETER_H
-#define UNITY_GREETER_H
+#pragma once
 
 #include <QLightDM/Greeter>
 #include <QtCore/QObject>
 
 class GreeterPrivate;
+class PromptsModel;
 
 class Greeter : public QObject
 {
@@ -37,18 +37,22 @@
     Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
     Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
     Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
-    Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
     Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
 
 public:
-    explicit Greeter(QObject* parent=0);
+    static Greeter *instance();
+    virtual ~Greeter();
 
     bool isActive() const;
     bool isAuthenticated() const;
     QString authenticationUser() const;
     QString defaultSessionHint() const;
-    bool promptless() const;
     QString selectUser() const;
+    bool hasGuestAccount() const;
+    bool showManualLoginHint() const;
+    bool hideUsersHint() const;
+
+    PromptsModel *promptsModel();
 
 public Q_SLOTS:
     void authenticate(const QString &username=QString());
@@ -57,21 +61,22 @@
     void setIsActive(bool isActive);
 
 Q_SIGNALS:
-    void showMessage(const QString &text, bool isError);
-    void showPrompt(const QString &text, bool isSecret, bool isDefaultPrompt);
-    void authenticationComplete();
-    void authenticationUserChanged(const QString &user);
+    void authenticationUserChanged();
     void isActiveChanged();
     void isAuthenticatedChanged();
-    void promptlessChanged();
     void showGreeter();
     void hideGreeter();
+    void loginError(bool automatic);
+    void loginSuccess(bool automatic);
+    void authenticationStarted(); // useful for testing
 
     // This signal is emitted by external agents like indicators, and the UI
     // should switch to this user if possible.
     void requestAuthenticationUser(const QString &user);
 
 protected:
+    explicit Greeter(QObject* parent=0);
+
     GreeterPrivate * const d_ptr;
 
     Q_DECLARE_PRIVATE(Greeter)
@@ -80,6 +85,5 @@
     void showMessageFilter(const QString &text, QLightDM::Greeter::MessageType type);
     void showPromptFilter(const QString &text, QLightDM::Greeter::PromptType type);
     void authenticationCompleteFilter();
+    void checkAuthenticationUser();
 };
-
-#endif
 
=== modified file 'plugins/LightDM/GreeterPrivate.h'
--- plugins/LightDM/GreeterPrivate.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/GreeterPrivate.h	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015-2017 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
@@ -14,10 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UNITY_GREETER_PRIVATE_H
-#define UNITY_GREETER_PRIVATE_H
-
-#include <QLightDM/Greeter>
+#pragma once
+
+#include "PromptsModel.h"
+#include <QObject>
+
+namespace QLightDM {
+    class Greeter;
+}
 
 class GreeterPrivate
 {
@@ -26,8 +30,11 @@
 
     QLightDM::Greeter *m_greeter;
     bool m_active;
-    bool wasPrompted;
-    bool promptless;
+    PromptsModel prompts;
+    PromptsModel leftovers; // prompts to show during next auth for same user
+    bool responded;
+    bool everResponded;
+    QString cachedAuthUser;
 
 protected:
     Greeter * const q_ptr;
@@ -35,5 +42,3 @@
 private:
     Q_DECLARE_PUBLIC(Greeter)
 };
-
-#endif // UNITY_GREETER_PRIVATE_H
 
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-07-28 15:34:29 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2017-01-25 16:04:08 +0000
@@ -49,7 +49,7 @@
 
 bool Greeter::hasGuestAccountHint() const
 {
-    return true;
+    return false;
 }
 
 QString Greeter::getHint(const QString &name) const
@@ -70,12 +70,12 @@
 
 bool Greeter::showManualLoginHint() const
 {
-    return true;
+    return false;
 }
 
 bool Greeter::showRemoteLoginHint() const
 {
-    return true;
+    return false;
 }
 
 QString Greeter::selectUserHint() const
@@ -146,7 +146,10 @@
 }
 
 void Greeter::cancelAuthentication()
-{}
+{
+    Q_D(Greeter);
+    d->cancelAuthentication();
+}
 
 void Greeter::setLanguage (const QString &language)
 {
 
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2015-11-02 17:22:30 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp	2017-01-25 16:04:08 +0000
@@ -206,6 +206,28 @@
         }
     }
 
+    void cancelPam()
+    {
+        if (pamHandle != nullptr) {
+            QFuture<int> pamFuture = futureWatcher.future();
+            pam_handle *handle = pamHandle;
+            pamHandle = nullptr; // to disable normal finishPam() handling
+            pamFuture.cancel();
+
+            // Note the empty loop, we just want to clear the futures queue.
+            // Any further prompts from the pam thread will be immediately
+            // responded to/dismissed in handlePrompt().
+            while (respond(QString()));
+
+            // Now let signal/slot handling happen so the thread can finish
+            while (!pamFuture.isFinished()) {
+                QCoreApplication::processEvents();
+            }
+
+            pam_end(handle, PAM_CONV_ERR);
+        }
+    }
+
 Q_SIGNALS:
     void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
     void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
@@ -247,28 +269,6 @@
     }
 
 private:
-    void cancelPam()
-    {
-        if (pamHandle != nullptr) {
-            QFuture<int> pamFuture = futureWatcher.future();
-            pam_handle *handle = pamHandle;
-            pamHandle = nullptr; // to disable normal finishPam() handling
-            pamFuture.cancel();
-
-            // Note the empty loop, we just want to clear the futures queue.
-            // Any further prompts from the pam thread will be immediately
-            // responded to/dismissed in handlePrompt().
-            while (respond(QString()));
-
-            // Now let signal/slot handling happen so the thread can finish
-            while (!pamFuture.isFinished()) {
-                QCoreApplication::processEvents();
-            }
-
-            pam_end(handle, PAM_CONV_ERR);
-        }
-    }
-
     Greeter *greeter;
     GreeterPrivate *greeterPrivate;
     pam_handle* pamHandle;
@@ -299,6 +299,11 @@
     m_impl->respond(response);
 }
 
+void GreeterPrivate::cancelAuthentication()
+{
+    m_impl->cancelPam();
+}
+
 }
 
 #include "GreeterPrivate.moc"
 
=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2017-01-25 16:04:08 +0000
@@ -38,6 +38,7 @@
 
     void handleAuthenticate();
     void handleRespond(const QString &response);
+    void cancelAuthentication();
 
 protected:
     GreeterImpl *m_impl; // if the backend needs more private data
 
=== added file 'plugins/LightDM/PromptsModel.cpp'
--- plugins/LightDM/PromptsModel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/PromptsModel.cpp	2017-01-25 16:04:08 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 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 "PromptsModel.h"
+
+PromptsModel::PromptsModel(QObject* parent)
+    : QAbstractListModel(parent)
+{
+    m_roleNames[TypeRole] = "type";
+    m_roleNames[TextRole] = "text";
+}
+
+PromptsModel& PromptsModel::operator=(const PromptsModel &other)
+{
+    beginResetModel();
+    m_prompts = other.m_prompts;
+    endResetModel();
+    Q_EMIT countChanged();
+    return *this;
+}
+
+int PromptsModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return m_prompts.size();
+}
+
+QVariant PromptsModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.column() > 0 || index.row() >= m_prompts.size())
+        return QVariant();
+
+    switch (role) {
+    case Qt::DisplayRole: // fallthrough
+    case TextRole:        return m_prompts[index.row()].prompt;
+    case TypeRole:        return m_prompts[index.row()].type;
+    default:              return QVariant();
+    }
+}
+
+QHash<int, QByteArray> PromptsModel::roleNames() const
+{
+    return m_roleNames;
+}
+
+void PromptsModel::prepend(const QString &text, PromptType type)
+{
+    beginInsertRows(QModelIndex(), 0, 0);
+    m_prompts.prepend(PromptInfo{text, type});
+    endInsertRows();
+
+    Q_EMIT countChanged();
+}
+
+void PromptsModel::append(const QString &text, PromptType type)
+{
+    beginInsertRows(QModelIndex(), m_prompts.size(), m_prompts.size());
+    m_prompts.append(PromptInfo{text, type});
+    endInsertRows();
+
+    Q_EMIT countChanged();
+}
+
+void PromptsModel::clear()
+{
+    beginResetModel();
+    m_prompts.clear();
+    endResetModel();
+
+    Q_EMIT countChanged();
+}
+
+bool PromptsModel::hasPrompt() const
+{
+    Q_FOREACH(const PromptInfo &info, m_prompts) {
+        if (info.type == PromptType::Secret || info.type == PromptType::Question) {
+            return true;
+        }
+    }
+    return false;
+}
 
=== added file 'plugins/LightDM/PromptsModel.h'
--- plugins/LightDM/PromptsModel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/PromptsModel.h	2017-01-25 16:04:08 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 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/>.
+ *
+ */
+
+#pragma once
+
+#include <QAbstractListModel>
+
+class PromptsModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    enum PromptsModelRoles {
+        TypeRole = Qt::UserRole,
+        TextRole,
+    };
+    Q_ENUM(PromptsModelRoles)
+
+    enum PromptType {
+        Message,
+        Error,
+        Secret,
+        Question,
+        Button,
+    };
+    Q_ENUM(PromptType)
+
+    explicit PromptsModel(QObject* parent=0);
+
+    PromptsModel& operator=(const PromptsModel &other);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    Q_INVOKABLE void prepend(const QString &text, PromptType type);
+    Q_INVOKABLE void append(const QString &text, PromptType type);
+
+    void clear();
+
+    bool hasPrompt() const;
+
+Q_SIGNALS:
+    void countChanged();
+
+private:
+    struct PromptInfo {
+        QString prompt;
+        PromptType type;
+    };
+
+    QList<PromptInfo> m_prompts;
+    QHash<int, QByteArray> m_roleNames;
+};
 
=== modified file 'plugins/LightDM/SessionsModel.cpp'
--- plugins/LightDM/SessionsModel.cpp	2016-10-07 17:24:55 +0000
+++ plugins/LightDM/SessionsModel.cpp	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-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
@@ -128,7 +128,6 @@
     }
 
     setModel(m_model);
-    setSourceModel(m_model);
     setSortCaseSensitivity(Qt::CaseInsensitive);
     setSortLocaleAware(true);
     setSortRole(Qt::DisplayRole);
 
=== modified file 'plugins/LightDM/SessionsModel.h'
--- plugins/LightDM/SessionsModel.h	2016-12-23 11:04:53 +0000
+++ plugins/LightDM/SessionsModel.h	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-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
@@ -15,8 +15,7 @@
  *
  */
 
-#ifndef UNITY_SESSIONSMODEL_H
-#define UNITY_SESSIONSMODEL_H
+#pragma once
 
 #include <unitysortfilterproxymodelqml.h>
 #include <QLightDM/SessionsModel>
@@ -30,6 +29,7 @@
 
     Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
             WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
+
 Q_SIGNALS:
     void iconSearchDirectoriesChanged();
 
@@ -54,6 +54,7 @@
     Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;
 
     void setIconSearchDirectories(const QList<QUrl> searchDirectories);
+
 private:
     QLightDM::SessionsModel* m_model;
     QHash<int, QByteArray> m_roleNames;
@@ -63,5 +64,3 @@
         QUrl("/usr/share/unity-greeter/")};
 
 };
-
-#endif // UNITY_SESSIONSMODEL_H
 
=== modified file 'plugins/LightDM/UsersModel.cpp'
--- plugins/LightDM/UsersModel.cpp	2015-10-26 20:15:08 +0000
+++ plugins/LightDM/UsersModel.cpp	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015-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,20 +12,22 @@
  *
  * 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 <[e-mail]>
  */
 
+#include "Greeter.h"
 #include "UsersModel.h"
+#include <QIdentityProxyModel>
 #include <QLightDM/UsersModel>
-#include <QtCore/QSortFilterProxyModel>
+
+#include <libintl.h>
 
 // First, we define an internal class that wraps LightDM's UsersModel.  This
 // class will modify some of the data coming from LightDM.  For example, we
-// modify any empty Real Names into just normal Names.
+// modify any empty Real Names into just normal Names.  We also add optional
+// rows, depending on configuration.
 // (We can't modify the data directly in UsersModel below because it won't sort
 // using the modified data.)
-class MangleModel : public QSortFilterProxyModel
+class MangleModel : public QIdentityProxyModel
 {
     Q_OBJECT
 
@@ -33,21 +35,75 @@
     explicit MangleModel(QObject* parent=0);
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+
+private:
+    struct CustomRow {
+        QString name;
+        QString realName;
+    };
+
+    int sourceRowCount() const;
+
+    void updateGuestRow();
+    void updateManualRow();
+    void updateCustomRows();
+
+    void addCustomRow(const CustomRow &newRow);
+    void removeCustomRow(const QString &rowName);
+
+    QList<CustomRow> m_customRows;
+    bool m_updatingCustomRows;
 };
 
 MangleModel::MangleModel(QObject* parent)
-  : QSortFilterProxyModel(parent)
+  : QIdentityProxyModel(parent)
+  , m_updatingCustomRows(false)
 {
     setSourceModel(new QLightDM::UsersModel(this));
+
+    updateCustomRows();
+
+    // Would be nice if there were a rowCountChanged signal in the base class.
+    // We redo all custom rows on any row count change, because (A) some of
+    // custom rows (manual login) use row count information and (B) when
+    // testing, we use a modelReset signal as a way to indicate that a custom
+    // row has been toggled off or on.
+    connect(this, &QIdentityProxyModel::modelReset,
+            this, &MangleModel::updateCustomRows);
+    connect(this, &QIdentityProxyModel::rowsInserted,
+            this, &MangleModel::updateCustomRows);
+    connect(this, &QIdentityProxyModel::rowsRemoved,
+            this, &MangleModel::updateCustomRows);
 }
 
 QVariant MangleModel::data(const QModelIndex &index, int role) const
 {
-    QVariant variantData = QSortFilterProxyModel::data(index, role);
+    QVariant variantData;
+
+    if (index.row() >= rowCount())
+        return QVariant();
+
+    bool isCustomRow = index.row() >= sourceRowCount();
+    if (isCustomRow && index.column() == 0) {
+        int customIndex = index.row() - sourceRowCount();
+        if (role == QLightDM::UsersModel::NameRole) {
+            variantData = m_customRows[customIndex].name;
+        } else if (role == QLightDM::UsersModel::RealNameRole) {
+            variantData = m_customRows[customIndex].realName;
+        } else if (role == QLightDM::UsersModel::LoggedInRole) {
+            variantData = false;
+        } else if (role == QLightDM::UsersModel::SessionRole) {
+            variantData = Greeter::instance()->defaultSessionHint();
+        }
+    } else {
+        variantData = QIdentityProxyModel::data(index, role);
+    }
 
     // If user's real name is empty, switch to unix name
     if (role == QLightDM::UsersModel::RealNameRole && variantData.toString().isEmpty()) {
-        variantData = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);
+        variantData = data(index, QLightDM::UsersModel::NameRole);
     } else if (role == QLightDM::UsersModel::BackgroundPathRole && variantData.toString().startsWith('#')) {
         const QString stringData = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='" + variantData.toString() + "'/></svg>";
         variantData = stringData;
@@ -56,6 +112,95 @@
     return variantData;
 }
 
+void MangleModel::addCustomRow(const CustomRow &newRow)
+{
+    for (int i = 0; i < m_customRows.size(); i++) {
+        if (m_customRows[i].name == newRow.name) {
+            return; // we don't have custom rows that change content yet
+        }
+    }
+
+    beginInsertRows(QModelIndex(), rowCount(), rowCount());
+    m_customRows << newRow;
+    endInsertRows();
+}
+
+void MangleModel::removeCustomRow(const QString &rowName)
+{
+    for (int i = 0; i < m_customRows.size(); i++) {
+        if (m_customRows[i].name == rowName) {
+            int rowNum = sourceRowCount() + i;
+            beginRemoveRows(QModelIndex(), rowNum, rowNum);
+            m_customRows.removeAt(i);
+            endRemoveRows();
+            break;
+        }
+    }
+}
+
+void MangleModel::updateManualRow()
+{
+    bool hasAnotherEntry = sourceRowCount() > 0;
+    for (int i = 0; !hasAnotherEntry && i < m_customRows.size(); i++) {
+        if (m_customRows[i].name != QStringLiteral("*other")) {
+            hasAnotherEntry = true;
+        }
+    }
+
+    // Show manual login if we are asked to OR if no other entry exists
+    if (Greeter::instance()->showManualLoginHint() || !hasAnotherEntry)
+        addCustomRow({QStringLiteral("*other"), gettext("Login")});
+    else
+        removeCustomRow(QStringLiteral("*other"));
+}
+
+void MangleModel::updateGuestRow()
+{
+    if (Greeter::instance()->hasGuestAccount())
+        addCustomRow({QStringLiteral("*guest"), gettext("Guest Session")});
+    else
+        removeCustomRow(QStringLiteral("*guest"));
+}
+
+void MangleModel::updateCustomRows()
+{
+    // We update when rowCount changes, but we also insert/remove rows here.
+    // So guard this function to avoid recursion.
+    if (m_updatingCustomRows)
+        return;
+
+    m_updatingCustomRows = true;
+    updateGuestRow();
+    updateManualRow();
+    m_updatingCustomRows = false;
+}
+
+int MangleModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+    else
+        return sourceRowCount() + m_customRows.size();
+}
+
+int MangleModel::sourceRowCount() const
+{
+    return Greeter::instance()->hideUsersHint() ? 0 : sourceModel()->rowCount();
+}
+
+QModelIndex MangleModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row >= rowCount())
+        return QModelIndex();
+
+    bool isCustomRow = row >= sourceRowCount();
+    if (isCustomRow && !parent.isValid()) {
+        return createIndex(row, column);
+    } else {
+        return QIdentityProxyModel::index(row, column, parent);
+    }
+}
+
 // **** Now we continue with actual UsersModel class ****
 
 UsersModel::UsersModel(QObject* parent)
@@ -68,4 +213,21 @@
     sort(0);
 }
 
+bool UsersModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
+{
+    auto leftName = source_left.data(QLightDM::UsersModel::NameRole);
+    auto rightName = source_right.data(QLightDM::UsersModel::NameRole);
+
+    if (leftName == QStringLiteral("*guest"))
+        return false;
+    if (rightName == QStringLiteral("*guest"))
+        return true;
+    if (leftName == QStringLiteral("*other"))
+        return false;
+    if (rightName == QStringLiteral("*other"))
+        return true;
+
+    return UnitySortFilterProxyModelQML::lessThan(source_left, source_right);
+}
+
 #include "UsersModel.moc"
 
=== modified file 'plugins/LightDM/UsersModel.h'
--- plugins/LightDM/UsersModel.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/UsersModel.h	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012,2013 Canonical, Ltd.
+ * Copyright (C) 2012-2013,2015-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,19 +12,16 @@
  *
  * 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 <[e-mail]>
  */
 
 /* This class is a really tiny filter around QLightDM::UsersModel.  There are
    some operations that we want to edit a bit for the benefit of Qml.
    Specifically, we want to sort users according to realName. */
 
-#ifndef UNITY_USERSMODEL_H
-#define UNITY_USERSMODEL_H
+#pragma once
 
 #include <unitysortfilterproxymodelqml.h>
-#include <QtCore/QObject>
+#include <QObject>
 
 class UsersModel : public UnitySortFilterProxyModelQML
 {
@@ -32,6 +29,7 @@
 
 public:
     explicit UsersModel(QObject* parent=0);
+
+protected:
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
 };
-
-#endif
 
=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2016-06-16 17:23:24 +0000
+++ plugins/LightDM/plugin.cpp	2017-01-25 16:04:08 +0000
@@ -19,6 +19,7 @@
 #include "DBusGreeter.h"
 #include "DBusGreeterList.h"
 #include "Greeter.h"
+#include "PromptsModel.h"
 #include "SessionsModel.h"
 #include "UsersModel.h"
 #include <libusermetricsoutput/ColorTheme.h>
@@ -32,16 +33,24 @@
 
 static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
-    Q_UNUSED(engine)
     Q_UNUSED(scriptEngine)
 
-    Greeter *greeter = new Greeter();
+    Greeter *greeter = Greeter::instance();
     new DBusGreeter(greeter, QStringLiteral("/"));
     new DBusGreeterList(greeter, QStringLiteral("/list"));
 
+    engine->setObjectOwnership(greeter, QQmlEngine::CppOwnership);
+
     return greeter;
 }
 
+static QObject *prompts_provider(QQmlEngine *engine, QJSEngine *)
+{
+    auto model = Greeter::instance()->promptsModel();
+    engine->setObjectOwnership(model, QQmlEngine::CppOwnership);
+    return model;
+}
+
 static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine)
@@ -78,8 +87,7 @@
     #error No library defined in LightDM plugin
 #endif
 
-    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
-    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
+    qmlRegisterSingletonType<PromptsModel>(uri, 0, 1, "Prompts", prompts_provider);
 
     qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
     qmlRegisterUncreatableType<QLightDM::SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
 
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2016-11-01 18:18:56 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2017-01-25 16:04:08 +0000
@@ -214,7 +214,6 @@
 void LauncherModel::setUser(const QString &username)
 {
     Q_UNUSED(username)
-    qWarning() << "This backend doesn't support multiple users";
 }
 
 QString LauncherModel::getUrlForAppId(const QString &appId) const
 
=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2016-12-07 13:43:25 +0000
+++ plugins/Utils/CMakeLists.txt	2017-01-25 16:04:08 +0000
@@ -34,6 +34,7 @@
     deviceconfigparser.cpp
     globalfunctions.cpp
     URLDispatcher.cpp
+    tabfocusfence.cpp
     plugin.cpp
     )
 
 
=== modified file 'plugins/Utils/appdrawerproxymodel.cpp'
--- plugins/Utils/appdrawerproxymodel.cpp	2016-12-23 11:04:53 +0000
+++ plugins/Utils/appdrawerproxymodel.cpp	2017-01-25 16:04:08 +0000
@@ -185,5 +185,5 @@
             return adpm->appId(sourceIndex.row());
         }
     }
-    return nullptr;
+    return QString();
 }
 
=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2016-11-01 18:18:56 +0000
+++ plugins/Utils/plugin.cpp	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Canonical, Ltd.
+ * Copyright (C) 2012-2017 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
@@ -40,6 +40,7 @@
 #include "globalfunctions.h"
 #include "URLDispatcher.h"
 #include "appdrawerproxymodel.h"
+#include "tabfocusfence.h"
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -84,4 +85,5 @@
     qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
     qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
     qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
+    qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
 }
 
=== added file 'plugins/Utils/tabfocusfence.cpp'
--- plugins/Utils/tabfocusfence.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/tabfocusfence.cpp	2017-01-25 16:04:08 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2017 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 "tabfocusfence.h"
+
+#include <private/qquickitem_p.h>
+
+TabFocusFenceItem::TabFocusFenceItem(QQuickItem *parent) : QQuickItem(parent)
+{
+    QQuickItemPrivate *d = QQuickItemPrivate::get(this);
+    d->isTabFence = true;
+    setFlag(ItemIsFocusScope);
+}
+
+bool TabFocusFenceItem::focusNext()
+{
+    QQuickItem * current = scopedFocusItem();
+    if (current) {
+        QQuickItem * next = current->nextItemInFocusChain(true);
+        if (next) {
+            next->setFocus(true, Qt::TabFocusReason);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool TabFocusFenceItem::focusPrev()
+{
+    QQuickItem * current = scopedFocusItem();
+    if (current) {
+        QQuickItem * prev = current->nextItemInFocusChain(false);
+        if (prev) {
+            prev->setFocus(true, Qt::BacktabFocusReason);
+            return true;
+        }
+    }
+    return false;
+}
+
+void TabFocusFenceItem::keyPressEvent(QKeyEvent *event)
+{
+    // Needed so we eat Tab keys when there's only one item inside the fence
+    if (event->key() == Qt::Key_Tab) {
+        event->accept();
+    } else {
+        QQuickItem::keyPressEvent(event);
+    }
+}
+
+void TabFocusFenceItem::keyReleaseEvent(QKeyEvent *event)
+{
+    // Needed so we eat Tab keys when there's only one item inside the fence
+    if (event->key() == Qt::Key_Tab) {
+        event->accept();
+    } else {
+        QQuickItem::keyReleaseEvent(event);
+    }
+}
 
=== added file 'plugins/Utils/tabfocusfence.h'
--- plugins/Utils/tabfocusfence.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/tabfocusfence.h	2017-01-25 16:04:08 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 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/>.
+*/
+
+#ifndef TABFOCUSFENCE_H
+#define TABFOCUSFENCE_H
+
+#include <QQuickItem>
+
+// An item that restricts focus Tab travelling
+// to its children
+class TabFocusFenceItem : public QQuickItem
+{
+Q_OBJECT
+
+public:
+    TabFocusFenceItem(QQuickItem *parent = nullptr);
+
+    Q_INVOKABLE bool focusNext();
+    Q_INVOKABLE bool focusPrev();
+
+    void keyPressEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;
+};
+
+#endif
 
=== modified file 'po/unity8.pot'
--- po/unity8.pot	2017-01-10 14:48:43 +0000
+++ po/unity8.pot	2017-01-25 16:04:08 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-10 14:48+0000\n"
+"POT-Creation-Date: 2017-01-24 07:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,10 +18,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: plugins/LightDM/Greeter.cpp:123
+#: plugins/LightDM/Greeter.cpp:188
 msgid "Password: "
 msgstr ""
 
+#: plugins/LightDM/Greeter.cpp:203
+msgid "Username"
+msgstr ""
+
+#: plugins/LightDM/Greeter.cpp:242
+msgid "Failed to authenticate"
+msgstr ""
+
+#: plugins/LightDM/Greeter.cpp:244
+msgid "Invalid password, please try again"
+msgstr ""
+
+#: plugins/LightDM/Greeter.cpp:254
+msgid "Log In"
+msgstr ""
+
+#: plugins/LightDM/Greeter.cpp:254
+msgid "Retry"
+msgstr ""
+
+#: plugins/LightDM/UsersModel.cpp:152
+msgid "Login"
+msgstr ""
+
+#: plugins/LightDM/UsersModel.cpp:160
+msgid "Guest Session"
+msgstr ""
+
 #: plugins/Unity/Launcher/launcheritem.cpp:50
 #: plugins/Unity/Launcher/launcheritem.cpp:122
 msgid "Pin shortcut"
@@ -35,66 +63,66 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:149
+#: qml/Components/Dialogs.qml:177
 msgctxt "Title: Lock/Log out dialog"
 msgid "Log out"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:150
+#: qml/Components/Dialogs.qml:178
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:152
+#: qml/Components/Dialogs.qml:181
 msgctxt "Button: Lock the system"
 msgid "Lock"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:160
+#: qml/Components/Dialogs.qml:191
 msgctxt "Button: Log out from the system"
 msgid "Log Out"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:167 qml/Components/Dialogs.qml:225
-#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:232
+#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:264
+#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:222
 #: qml/Wizard/Pages/passcode-confirm.qml:32
 #: qml/Wizard/Pages/passcode-set.qml:32
 msgid "Cancel"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:179
+#: qml/Components/Dialogs.qml:211
 msgctxt "Title: Reboot dialog"
 msgid "Reboot"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:180
+#: qml/Components/Dialogs.qml:212
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:182
+#: qml/Components/Dialogs.qml:215
 msgid "No"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:189
+#: qml/Components/Dialogs.qml:223
 msgid "Yes"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:204
+#: qml/Components/Dialogs.qml:239
 msgctxt "Title: Power off/Restart dialog"
 msgid "Power"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:205
+#: qml/Components/Dialogs.qml:240
 msgid ""
 "Are you sure you would like\n"
 "to power off?"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:208
+#: qml/Components/Dialogs.qml:244
 msgctxt "Button: Power off the system"
 msgid "Power off"
 msgstr ""
 
-#: qml/Components/Dialogs.qml:217
+#: qml/Components/Dialogs.qml:255
 msgctxt "Button: Restart the system"
 msgid "Restart"
 msgstr ""
@@ -120,7 +148,7 @@
 msgstr ""
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:80
-msgid "Takes a screenshot of a window."
+msgid "Takes a screenshot of the current window."
 msgstr ""
 
 #: qml/Components/KeyboardShortcutsOverlay.qml:88
@@ -267,7 +295,7 @@
 msgid "Closes the current window."
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:252
+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:242
 msgid "Return to Call"
 msgstr ""
 
@@ -275,7 +303,7 @@
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:244
+#: qml/Components/Lockscreen.qml:245
 msgid "OK"
 msgstr ""
 
@@ -289,29 +317,29 @@
 msgid "%1:%2"
 msgstr ""
 
-#: qml/Components/ModeSwitchWarningDialog.qml:32
+#: qml/Components/ModeSwitchWarningDialog.qml:33
 msgid "Apps may have unsaved data:"
 msgstr ""
 
-#: qml/Components/ModeSwitchWarningDialog.qml:57
+#: qml/Components/ModeSwitchWarningDialog.qml:60
 msgctxt ""
 "Re-dock means connect the device again to an external screen/mouse/keyboard"
 msgid "Re-dock, save your work and close these apps to continue."
 msgstr ""
 
-#: qml/Components/ModeSwitchWarningDialog.qml:63
+#: qml/Components/ModeSwitchWarningDialog.qml:67
 msgid "Or force close now (unsaved data will be lost)."
 msgstr ""
 
-#: qml/Components/ModeSwitchWarningDialog.qml:75
+#: qml/Components/ModeSwitchWarningDialog.qml:80
 msgid "OK, I will reconnect"
 msgstr ""
 
-#: qml/Components/ModeSwitchWarningDialog.qml:76
+#: qml/Components/ModeSwitchWarningDialog.qml:81
 msgid "Reconnect now!"
 msgstr ""
 
-#: qml/Components/ModeSwitchWarningDialog.qml:88
+#: qml/Components/ModeSwitchWarningDialog.qml:94
 msgid "Close all"
 msgstr ""
 
@@ -461,44 +489,44 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: qml/Greeter/Greeter.qml:592
+#: qml/Greeter/Greeter.qml:561
 msgid "Try again"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:70
+#: qml/Greeter/Greeter.qml:562
+msgid "Enter passphrase to unlock"
+msgstr ""
+
+#: qml/Greeter/Greeter.qml:563
+msgid "Enter passcode to unlock"
+msgstr ""
+
+#: qml/Greeter/NarrowView.qml:242
+msgid "Emergency"
+msgstr ""
+
+#: qml/Greeter/PromptList.qml:126
 msgid "Passphrase"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:71
+#: qml/Greeter/PromptList.qml:126
 msgid "Passcode"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:98
-msgid "Retry"
-msgstr ""
-
-#: qml/Greeter/LoginList.qml:99
-msgid "Log In"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:252
-msgid "Emergency"
-msgstr ""
-
 #: qml/Greeter/SessionsList.qml:122
 msgid "Select desktop environment"
 msgstr ""
 
-#: qml/Launcher/Drawer.qml:80
+#: qml/Launcher/Drawer.qml:92
 msgid "Search…"
 msgstr ""
 
-#: qml/Launcher/Drawer.qml:101
+#: qml/Launcher/Drawer.qml:123
 msgctxt "Apps sorted alphabetically"
 msgid "A-Z"
 msgstr ""
 
-#: qml/Launcher/MoreAppsHeader.qml:32
+#: qml/Launcher/MoreAppsHeader.qml:39
 msgid "More apps in the store"
 msgstr ""
 
 
=== modified file 'qml/ApplicationMenus/MenuBar.qml'
--- qml/ApplicationMenus/MenuBar.qml	2017-01-09 15:26:05 +0000
+++ qml/ApplicationMenus/MenuBar.qml	2017-01-25 16:04:08 +0000
@@ -57,6 +57,20 @@
         onReleased: d.stopSHortcutTimer()
     }
 
+    GlobalShortcut {
+        shortcut: Qt.AltModifier | Qt.Key_F10
+        active: enableKeyFilter && d.currentItem == null
+        onTriggered: {
+            for (var i = 0; i < rowRepeater.count; i++) {
+                var item = rowRepeater.itemAt(i);
+                if (item.enabled) {
+                    item.show();
+                    break;
+                }
+            }
+        }
+    }
+
     InverseMouseArea {
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: parent
 
=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
--- qml/ApplicationMenus/MenuPopup.qml	2017-01-09 15:26:05 +0000
+++ qml/ApplicationMenus/MenuPopup.qml	2017-01-25 16:04:08 +0000
@@ -26,19 +26,7 @@
     objectName: "menu"
     backgroundColor: theme.palette.normal.overlay
 
-    property alias unityMenuModel: listView.model
-
-    readonly property real __ajustedMinimumHeight: {
-        if (listView.contentHeight > __minimumHeight) {
-            return units.gu(30);
-        }
-        return Math.max(listView.contentHeight, units.gu(2));
-    }
-
-    readonly property real __minimumWidth: units.gu(20)
-    readonly property real __minimumHeight: units.gu(30)
-    readonly property real __maximumWidth: Screen.width * 0.7
-    readonly property real __maximumHeight: Screen.height * 0.7
+    property alias unityMenuModel: repeater.model
 
     function show() {
         visible = true;
@@ -63,18 +51,23 @@
         d.dismissAll();
     }
 
-    implicitWidth: container.width
-    implicitHeight: MathUtils.clamp(listView.contentHeight, __ajustedMinimumHeight, __maximumHeight)
+    implicitWidth: focusScope.width
+    implicitHeight: focusScope.height
 
     MenuNavigator {
         id: d
         objectName: "d"
-        itemView: listView
+        itemView: repeater
 
         property Item currentItem: null
         property Item hoveredItem: null
         readonly property int currentIndex: currentItem ? currentItem.__ownIndex : -1
 
+        property real __minimumWidth: units.gu(20)
+        property real __maximumWidth: Screen.width * 0.7
+        property real __minimumHeight: units.gu(2)
+        property real __maximumHeight: Screen.height * 0.7
+
         signal dismissAll()
 
         onCurrentItemChanged: {
@@ -86,13 +79,26 @@
         }
 
         onSelect: {
-            currentItem = listView.itemAt(index);
+            currentItem = repeater.itemAt(index);
+            if (currentItem) {
+                if (currentItem.y < listView.contentY) {
+                    listView.contentY = currentItem.y;
+                } else if (currentItem.y + currentItem.height > listView.contentY + listView.height) {
+                    listView.contentY = currentItem.y + currentItem.height - listView.height;
+                }
+            }
         }
     }
 
+    MouseArea {
+        // Eat events.
+        anchors.fill: parent
+    }
+
     Item {
         id: focusScope
-        anchors.fill: parent
+        width: container.width
+        height: container.height
         focus: visible
 
         Keys.onUpPressed: d.selectPrevious(d.currentIndex)
@@ -108,17 +114,17 @@
             id: container
             objectName: "container"
 
-            width: listView.contentWidth
-            height: parent.height
+            height: MathUtils.clamp(listView.contentHeight, d.__minimumHeight, d.__maximumHeight)
+            width: menuColumn.width
             spacing: 0
 
-            // FIXME use ListView.header - tried but was flaky with positionViewAtIndex.
+            // Header - scroll up
             Item {
-                Layout.fillWidth: true;
-                Layout.maximumHeight: units.gu(3)
-                Layout.minimumHeight: units.gu(3)
+                Layout.fillWidth: true
+                height: units.gu(3)
                 visible: listView.contentHeight > root.height
                 enabled: !listView.atYBeginning
+                z: 1
 
                 Rectangle {
                     color: enabled ? theme.palette.normal.overlayText :
@@ -143,47 +149,35 @@
                 MouseArea {
                     anchors.fill: parent
                     onPressed: {
-                        var index = listView.indexAt(0, listView.contentY);
-                        listView.positionViewAtIndex(index-1, ListView.Beginning);
+                        var item = menuColumn.childAt(0, listView.contentY);
+                        if (item) {
+                            var previousItem = item;
+                            do {
+                                previousItem = repeater.itemAt(previousItem.__ownIndex-1);
+                                if (!previousItem) {
+                                    listView.contentY = 0;
+                                    return;
+                                }
+                            } while (previousItem.__isSeparator);
+
+                            listView.contentY = previousItem.y
+                        }
                     }
                 }
             }
 
-            ListView {
+            // Menu Items
+            Flickable {
                 id: listView
-                objectName: "listView"
+                clip: interactive
+
                 Layout.fillHeight: true
                 Layout.fillWidth: true
-                contentWidth: MathUtils.clamp(contentItem.childrenRect.width,
-                                              __minimumWidth,
-                                              __maximumWidth)
-
-                orientation: Qt.Vertical
-                interactive: contentHeight > height
-                clip: interactive
-                highlightFollowsCurrentItem: false
-
-                highlight: Rectangle {
-                    color: "transparent"
-                    border.width: units.dp(1)
-                    border.color: UbuntuColors.orange
-                    z: 1
-
-                    width: listView.width
-                    height:  d.currentItem ? d.currentItem.height : 0
-                    y:  d.currentItem ? d.currentItem.y : 0
-                    visible: d.currentItem
-                }
-
-                function itemAt(index) {
-                    if (index > count || index < 0) return null;
-                    currentIndex = index;
-                    return currentItem;
-                }
+                contentHeight: menuColumn.height
+                interactive: height < contentHeight
 
                 MouseArea {
-                    id: menuMouseArea
-                    anchors.fill: listView
+                    anchors.fill: parent
                     hoverEnabled: true
                     propagateComposedEvents: true // propogate events so we send clicks to children.
                     z: 1 // on top so we override any other hovers
@@ -195,7 +189,7 @@
 
                         if (!d.hoveredItem || !d.currentItem ||
                                 !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
-                            d.hoveredItem = listView.itemAt(listView.indexAt(pos.x, pos.y));
+                            d.hoveredItem = menuColumn.childAt(pos.x, pos.y)
                             if (!d.hoveredItem || !d.hoveredItem.enabled)
                                 return false;
                             d.currentItem = d.hoveredItem;
@@ -216,89 +210,123 @@
                     }
                 }
 
-                delegate: Loader {
-                    id: loader
-                    objectName: root.objectName + "-item" + __ownIndex
-
-                    property int __ownIndex: index
-
-                    width: root.width
-                    enabled: model.isSeparator ? false : model.sensitive
-
-                    sourceComponent: {
-                        if (model.isSeparator) {
-                            return separatorComponent;
-                        }
-                        return menuItemComponent;
-                    }
-
-                    property Item popup: null
-
-                    Component {
-                        id: menuItemComponent
-                        MenuItem {
-                            id: menuItem
-                            menuData: model
-                            objectName: loader.objectName + "-actionItem"
-
-                            action.onTriggered: {
-                                d.currentItem = loader;
-
-                                if (hasSubmenu) {
-                                    if (!popup) {
-                                        var model = root.unityMenuModel.submenu(__ownIndex);
-                                        popup = submenuComponent.createObject(focusScope, {
-                                                                                  objectName: loader.objectName + "-",
-                                                                                  unityMenuModel: model,
-                                                                                  x: Qt.binding(function() { return root.width }),
-                                                                                  y: Qt.binding(function() { return loader.y })
-                                                                              });
-                                    } else if (popup) {
-                                        popup.visible = true;
-                                    }
-                                    popup.retreat.connect(function() {
-                                        popup.destroy();
-                                        popup = null;
-                                        menuItem.forceActiveFocus();
-                                    })
-                                } else {
-                                    root.unityMenuModel.activate(__ownIndex);
-                                }
-                            }
-
-                            Connections {
-                                target: d
-                                onCurrentIndexChanged: {
-                                    if (popup && d.currentIndex != __ownIndex) {
-                                        popup.visible = false;
-                                    }
-                                }
-                                onDismissAll: {
-                                    if (popup) {
-                                        popup.destroy();
-                                        popup = null;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Component {
-                        id: separatorComponent
-                        ListItems.ThinDivider {
-                            objectName: loader.objectName + "-separator"
-                        }
-                    }
-                }
-            } // ListView
-
-            // FIXME use ListView.footer - tried but was flaky with positionViewAtIndex.
+                ColumnLayout {
+                    id: menuColumn
+                    spacing: 0
+
+                    width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
+
+                    Repeater {
+                        id: repeater
+
+                        Loader {
+                            id: loader
+                            objectName: root.objectName + "-item" + __ownIndex
+
+                            property int __ownIndex: index
+                            property bool __isSeparator: model.isSeparator
+
+                            enabled: __isSeparator ? false : model.sensitive
+
+                            sourceComponent: {
+                                if (model.isSeparator) {
+                                    return separatorComponent;
+                                }
+                                return menuItemComponent;
+                            }
+
+                            property Item popup: null
+
+                            Layout.fillWidth: true
+
+                            Component {
+                                id: menuItemComponent
+                                MenuItem {
+                                    id: menuItem
+                                    menuData: model
+                                    objectName: loader.objectName + "-actionItem"
+
+                                    width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
+
+                                    action.onTriggered: {
+                                        d.currentItem = loader;
+
+                                        if (hasSubmenu) {
+                                            if (!popup) {
+                                                var model = root.unityMenuModel.submenu(__ownIndex);
+                                                popup = submenuComponent.createObject(focusScope, {
+                                                                                          objectName: loader.objectName + "-",
+                                                                                          unityMenuModel: model,
+                                                                                          x: Qt.binding(function() { return root.width }),
+                                                                                          y: Qt.binding(function() {
+                                                                                              var dummy = listView.contentY; // force a recalc on contentY change.
+                                                                                              return mapToItem(container, 0, y).y;
+                                                                                          })
+                                                                                      });
+                                            } else if (popup) {
+                                                popup.visible = true;
+                                            }
+                                            popup.retreat.connect(function() {
+                                                popup.destroy();
+                                                popup = null;
+                                                menuItem.forceActiveFocus();
+                                            })
+                                        } else {
+                                            root.unityMenuModel.activate(__ownIndex);
+                                        }
+                                    }
+
+                                    Connections {
+                                        target: d
+                                        onCurrentIndexChanged: {
+                                            if (popup && d.currentIndex != __ownIndex) {
+                                                popup.visible = false;
+                                            }
+                                        }
+                                        onDismissAll: {
+                                            if (popup) {
+                                                popup.destroy();
+                                                popup = null;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            Component {
+                                id: separatorComponent
+                                ListItems.ThinDivider {
+                                    objectName: loader.objectName + "-separator"
+                                    implicitHeight: units.dp(2)
+                                }
+                            }
+                        }
+
+                    }
+                }
+
+                // Highlight
+                Rectangle {
+                    color: "transparent"
+                    border.width: units.dp(1)
+                    border.color: UbuntuColors.orange
+                    z: 1
+
+                    width: listView.width
+                    height:  d.currentItem ? d.currentItem.height : 0
+                    y:  d.currentItem ? d.currentItem.y : 0
+                    visible: d.currentItem
+                }
+
+            } // Flickable
+
+            // Header - scroll down
             Item {
-                Layout.fillWidth: true;
-                Layout.maximumHeight: units.gu(3)
-                Layout.minimumHeight: units.gu(3)
+                Layout.fillWidth: true
+                height: units.gu(3)
                 visible: listView.contentHeight > root.height
                 enabled: !listView.atYEnd
+                z: 1
 
                 Rectangle {
                     color: enabled ? theme.palette.normal.overlayText :
@@ -323,8 +351,19 @@
                 MouseArea {
                     anchors.fill: parent
                     onPressed: {
-                        var index = listView.indexAt(0, listView.contentY);
-                        listView.positionViewAtIndex(index+1, ListView.Beginning);
+                        var item = menuColumn.childAt(0, listView.contentY + listView.height);
+                        if (item) {
+                            var nextItem = item;
+                            do {
+                                nextItem = repeater.itemAt(nextItem.__ownIndex+1);
+                                if (!nextItem) {
+                                    listView.contentY = listView.contentHeight - listView.height;
+                                    return;
+                                }
+                            } while (nextItem.__isSeparator);
+
+                            listView.contentY = nextItem.y - listView.height
+                        }
                     }
                 }
             }
 
=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2016-12-20 08:55:23 +0000
+++ qml/Components/Dialogs.qml	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016 Canonical, Ltd.
+ * Copyright (C) 2014-2017 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
@@ -24,10 +24,13 @@
 import Utils 0.1
 import "../Greeter"
 
-Item {
+MouseArea {
     id: root
+    acceptedButtons: Qt.AllButtons
+    hoverEnabled: true
+    onWheel: wheel.accepted = true
 
-    readonly property alias hasActiveDialog: dialogLoader.active
+    readonly property bool hasActiveDialog: dialogLoader.active || d.modeSwitchWarningPopup
 
     // to be set from outside, useful mostly for testing purposes
     property var unitySessionService: DBusUnitySessionService
@@ -42,6 +45,7 @@
     }
     property string usageScenario
     property size screenSize: Qt.size(Screen.width, Screen.height)
+    property bool hasKeyboard: false
 
     signal powerOffClicked();
 
@@ -120,6 +124,11 @@
         onTriggered: LightDMService.greeter.showGreeter()
     }
 
+    GlobalShortcut { // lock screen
+        shortcut: Qt.MetaModifier|Qt.Key_L
+        onTriggered: LightDMService.greeter.showGreeter()
+    }
+
     QtObject {
         id: d // private stuff
         objectName: "dialogsPrivate"
@@ -140,6 +149,25 @@
         objectName: "dialogLoader"
         anchors.fill: parent
         active: false
+        onActiveChanged: {
+            if (!active) {
+                if (previousFocusedItem) {
+                    previousFocusedItem.forceActiveFocus(Qt.OtherFocusReason);
+                    previousFocusedItem = undefined;
+                }
+                previousSourceComponent = undefined;
+                sourceComponent = undefined;
+            }
+        }
+        onSourceComponentChanged: {
+            if (previousSourceComponent !== sourceComponent) {
+                previousSourceComponent = sourceComponent;
+                previousFocusedItem = window.activeFocusItem;
+            }
+        }
+
+        property var previousSourceComponent: undefined
+        property var previousFocusedItem: undefined
     }
 
     Component {
@@ -149,13 +177,16 @@
             title: i18n.ctr("Title: Lock/Log out dialog", "Log out")
             text: i18n.tr("Are you sure you want to log out?")
             Button {
+                width: parent.width
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
                     LightDMService.greeter.showGreeter()
                     logoutDialog.hide();
                 }
+                Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)
             }
             Button {
+                width: parent.width
                 focus: true
                 text: i18n.ctr("Button: Log out from the system", "Log Out")
                 onClicked: {
@@ -164,6 +195,7 @@
                 }
             }
             Button {
+                width: parent.width
                 text: i18n.tr("Cancel")
                 onClicked: {
                     logoutDialog.hide();
@@ -179,12 +211,14 @@
             title: i18n.ctr("Title: Reboot dialog", "Reboot")
             text: i18n.tr("Are you sure you want to reboot?")
             Button {
+                width: parent.width
                 text: i18n.tr("No")
                 onClicked: {
                     rebootDialog.hide();
                 }
             }
             Button {
+                width: parent.width
                 focus: true
                 text: i18n.tr("Yes")
                 onClicked: {
@@ -193,6 +227,7 @@
                     rebootDialog.hide();
                 }
                 color: theme.palette.normal.negative
+                Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)
             }
         }
     }
@@ -204,6 +239,7 @@
             title: i18n.ctr("Title: Power off/Restart dialog", "Power")
             text: i18n.tr("Are you sure you would like\nto power off?")
             Button {
+                width: parent.width
                 focus: true
                 text: i18n.ctr("Button: Power off the system", "Power off")
                 onClicked: {
@@ -212,8 +248,10 @@
                     root.powerOffClicked();
                 }
                 color: theme.palette.normal.negative
+                Component.onCompleted: if (root.hasKeyboard) forceActiveFocus(Qt.TabFocusReason)
             }
             Button {
+                width: parent.width
                 text: i18n.ctr("Button: Restart the system", "Restart")
                 onClicked: {
                     root.closeAllApps();
@@ -222,6 +260,7 @@
                 }
             }
             Button {
+                width: parent.width
                 text: i18n.tr("Cancel")
                 onClicked: {
                     powerDialog.hide();
 
=== modified file 'qml/Components/KeyboardShortcutsOverlay.qml'
--- qml/Components/KeyboardShortcutsOverlay.qml	2016-11-29 10:35:21 +0000
+++ qml/Components/KeyboardShortcutsOverlay.qml	2017-01-25 16:04:08 +0000
@@ -77,7 +77,7 @@
                     font.weight: Font.Medium
                 }
                 Label {
-                    text: i18n.tr("Takes a screenshot of a window.")
+                    text: i18n.tr("Takes a screenshot of the current window.")
                     fontSize: "small"
                     font.weight: Font.Light
                     wrapMode: Text.Wrap
 
=== modified file 'qml/Components/KeymapSwitcher.qml'
--- qml/Components/KeymapSwitcher.qml	2016-11-30 19:24:02 +0000
+++ qml/Components/KeymapSwitcher.qml	2017-01-25 16:04:08 +0000
@@ -51,6 +51,9 @@
             nextIndex = currentKeymapIndex + 1;
         }
         currentKeymapIndex = nextIndex;
+        if (actionGroup.currentAction.valid) {
+            actionGroup.currentAction.updateState(currentKeymapIndex);
+        }
     }
 
     function previousKeymap() {
@@ -60,30 +63,35 @@
             prevIndex = currentKeymapIndex - 1;
         }
         currentKeymapIndex = prevIndex;
+        if (actionGroup.currentAction.valid) {
+            actionGroup.currentAction.updateState(currentKeymapIndex);
+        }
     }
 
-    property Binding surfaceKeymapBinding: Binding {
+    property Binding surfaceKeymapBinding: Binding { // NB: needed mainly for xmir & libertine apps
         target: root.focusedSurface
         property: "keymap"
         value: root.currentKeymap
     }
 
+    property Binding unityKeymapBinding: Binding {
+        target: Mir
+        property: "currentKeymap"
+        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")
+        property variant currentAction: action("current") // the one that's checked by the indicator
+        property variant activeAction: action("active")   // the one that we clicked
 
         Component.onCompleted: actionGroup.start();
     }
 
-    onCurrentKeymapIndexChanged: {
-        actionGroup.currentAction.updateState(currentKeymapIndex);
-    }
-
     readonly property int activeActionState: actionGroup.activeAction.valid ? actionGroup.activeAction.state : -1
 
     onActiveActionStateChanged: {
 
=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2016-08-30 14:06:47 +0000
+++ qml/Components/Lockscreen.qml	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -240,8 +240,10 @@
             property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
 
             Button {
+                width: parent.width
                 objectName: "infoPopupOkButton"
                 text: i18n.tr("OK")
+                focus: true
                 onClicked: {
                     PopupUtils.close(dialog)
                     root.infoPopupConfirmed();
 
=== modified file 'qml/Components/ModeSwitchWarningDialog.qml'
--- qml/Components/ModeSwitchWarningDialog.qml	2016-05-17 20:46:51 +0000
+++ qml/Components/ModeSwitchWarningDialog.qml	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2017 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
@@ -29,6 +29,7 @@
     signal forceClose();
 
     Label {
+        width: parent.width
         text: i18n.tr("Apps may have unsaved data:")
         fontSize: "large"
         color: "#5D5D5D"
@@ -37,6 +38,7 @@
     Repeater {
         id: appRepeater
         RowLayout {
+            width: parent.width
             spacing: units.gu(2)
             Image {
                 Layout.preferredHeight: units.gu(2)
@@ -54,20 +56,23 @@
     }
 
     Label {
+        width: parent.width
         text: i18n.ctr("Re-dock means connect the device again to an external screen/mouse/keyboard", "Re-dock, save your work and close these apps to continue.")
         wrapMode: Text.WordWrap
         color: "#888888"
     }
 
     Label {
+        width: parent.width
         text: i18n.tr("Or force close now (unsaved data will be lost).")
         wrapMode: Text.WordWrap
         color: "#888888"
     }
 
-    ThinDivider {}
+    ThinDivider { width: parent.width }
 
     RowLayout {
+        width: parent.width
         Label {
             objectName: "reconnectLabel"
             Layout.fillWidth: true
@@ -84,6 +89,7 @@
         }
 
         Button {
+            focus: true
             objectName: "forceCloseButton"
             text: i18n.tr("Close all")
             color: theme.palette.normal.negative
 
=== modified file 'qml/Components/ShellDialog.qml'
--- qml/Components/ShellDialog.qml	2016-03-29 03:47:39 +0000
+++ qml/Components/ShellDialog.qml	2017-01-25 16:04:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2017 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
@@ -19,6 +19,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes 1.3
 import Ubuntu.Components.Popups 1.3
+import Utils 0.1
 
 /*
     A Dialog configured for use as a proper in-scene Dialog
@@ -32,10 +33,10 @@
     // NB: PopupBase, Dialog's superclass, will check for the existence of this property
     property bool reparentToRootItem: false
 
+    default property alias columnContents: column.data
+
     onVisibleChanged: { if (!visible && dialogLoader) { dialogLoader.active = false; } }
 
-    Keys.onEscapePressed: hide()
-
     focus: true
 
     // FIXME: this is a hack because Dialog subtheming seems broken atm
@@ -50,4 +51,21 @@
         __foreground.theme = themeHack
         show();
     }
+
+    TabFocusFence {
+        width: parent.width
+        height: column.height
+        focus: true
+        Column {
+            id: column
+            width: parent.width
+            spacing: units.gu(2)
+        }
+        Keys.onDownPressed: {
+            event.accepted = focusNext();
+        }
+        Keys.onUpPressed: {
+            event.accepted = focusPrev();
+        }
+    }
 }
 
=== modified file 'qml/Greeter/Circle.qml'
--- qml/Greeter/Circle.qml	2016-08-30 14:10:12 +0000
+++ qml/Greeter/Circle.qml	2017-01-25 16:04:08 +0000
@@ -27,7 +27,7 @@
     onCenterCircleChanged: requestPaint()
 
     onPaint: {
-        if (circleScale <= 0) {
+        if (circleScale <= 0 || width <= 0 || height <= 0) {
             return;
         }
 
 
=== modified file 'qml/Greeter/FullLightDMImpl.qml'
--- qml/Greeter/FullLightDMImpl.qml	2015-11-19 21:47:32 +0000
+++ qml/Greeter/FullLightDMImpl.qml	2017-01-25 16:04:08 +0000
@@ -22,6 +22,7 @@
 
     property var greeter: LightDM.Greeter
     property var infographic: LightDM.Infographic
+    property var prompts: LightDM.Prompts
     property var sessions: LightDM.Sessions
     property var sessionRoles: LightDM.SessionRoles
     property var users: LightDM.Users
 
=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-11-29 00:13:45 +0000
+++ qml/Greeter/Greeter.qml	2017-01-25 16:04:08 +0000
@@ -74,11 +74,11 @@
         forcedUnlock = false;
         if (required) {
             if (loader.item) {
-                loader.item.reset(true /* forceShow */);
+                loader.item.forceShow();
             }
             // Normally loader.onLoaded will select a user, but if we're
             // already shown, do it manually.
-            d.selectUser(d.currentIndex, false);
+            d.selectUser(d.currentIndex);
         }
 
         // Even though we may already be shown, we want to call show() for its
@@ -154,7 +154,7 @@
         readonly property bool multiUser: LightDMService.users.count > 1
         readonly property int selectUserIndex: d.getUserIndex(LightDMService.greeter.selectUser)
         property int currentIndex: Math.max(selectUserIndex, 0)
-        property bool waiting
+        readonly property bool waiting: LightDMService.prompts.count == 0 && !root.forcedUnlock
         property bool isLockscreen // true when we are locking an active session, rather than first user login
         readonly property bool secureFingerprint: isLockscreen &&
                                                   AccountsService.failedFingerprintLogins <
@@ -189,13 +189,9 @@
             return -1;
         }
 
-        function selectUser(index, reset) {
+        function selectUser(index) {
             if (index < 0 || index >= LightDMService.users.count)
                 return;
-            d.waiting = true;
-            if (reset) {
-                loader.item.reset(false /* forceShow */);
-            }
             currentIndex = index;
             var user = LightDMService.users.data(index, LightDMService.userRoles.NameRole);
             AccountsService.user = user;
@@ -206,20 +202,17 @@
         function hideView() {
             if (loader.item) {
                 loader.item.enabled = false; // drop OSK and prevent interaction
-                loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
                 loader.item.hide();
             }
         }
 
         function login() {
-            d.waiting = true;
             if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
                 sessionStarted();
                 hideView();
             } else if (loader.item) {
                 loader.item.notifyAuthenticationFailed();
             }
-            d.waiting = false;
         }
 
         function startUnlock(toTheRight) {
@@ -239,27 +232,13 @@
             }
         }
 
-        function showPromptMessage(text, isError) {
-            // inefficient, but we only rarely deal with messages
-            var html = text.replace(/&/g, "&amp;")
-                           .replace(/</g, "&lt;")
-                           .replace(/>/g, "&gt;")
-                           .replace(/\n/g, "<br>");
-            if (isError) {
-                html = "<font color=\"#df382c\">" + html + "</font>";
-            }
-
-            if (loader.item) {
-                loader.item.showMessage(html);
-            }
-        }
-
         function showFingerprintMessage(msg) {
+            d.selectUser(d.currentIndex);
+            LightDMService.prompts.prepend(msg, LightDMService.prompts.Error);
             if (loader.item) {
-                loader.item.reset(false /* forceShow */);
                 loader.item.showErrorMessage(msg);
+                loader.item.notifyAuthenticationFailed();
             }
-            showPromptMessage(msg, true);
         }
     }
 
@@ -285,7 +264,6 @@
 
     onRequiredChanged: {
         if (required) {
-            d.waiting = true;
             lockedApp = "";
         }
     }
@@ -377,14 +355,14 @@
         onLoaded: {
             root.lockedApp = "";
             item.forceActiveFocus();
-            d.selectUser(d.currentIndex, true);
+            d.selectUser(d.currentIndex);
             LightDMService.infographic.readyForDataChange();
         }
 
         Connections {
             target: loader.item
             onSelected: {
-                d.selectUser(index, true);
+                d.selectUser(index);
             }
             onResponded: {
                 if (root.locked) {
@@ -481,27 +459,15 @@
         onShowGreeter: root.forceShow()
         onHideGreeter: root.forcedUnlock = true
 
-        onShowMessage: d.showPromptMessage(text, isError)
-
-        onShowPrompt: {
-            if (loader.item) {
-                loader.item.showPrompt(text, isSecret, isDefaultPrompt);
+        onLoginError: {
+            if (!loader.item) {
+                return;
             }
 
-            d.waiting = false;
-        }
-
-        onAuthenticationComplete: {
-            d.waiting = false;
-
-            if (LightDMService.greeter.authenticated) {
-                if (!LightDMService.greeter.promptless) {
-                    d.login();
-                }
-            } else {
-                if (!LightDMService.greeter.promptless) {
-                    AccountsService.failedLogins++;
-                }
+            loader.item.notifyAuthenticationFailed();
+
+            if (!automatic) {
+                AccountsService.failedLogins++;
 
                 // Check if we should initiate a factory reset
                 if (maxFailedLogins >= 2) { // require at least a warning
@@ -519,14 +485,17 @@
                     forcedDelayTimer.forceDelay();
                 }
 
-                loader.item.notifyAuthenticationFailed();
-                if (!LightDMService.greeter.promptless) {
-                    d.selectUser(d.currentIndex, false);
-                }
-            }
-        }
-
-        onRequestAuthenticationUser: d.selectUser(d.getUserIndex(user), true)
+                d.selectUser(d.currentIndex);
+            }
+        }
+
+        onLoginSuccess: {
+            if (!automatic) {
+                d.login();
+            }
+        }
+
+        onRequestAuthenticationUser: d.selectUser(d.getUserIndex(user))
     }
 
     Connections {
@@ -589,7 +558,9 @@
             if (!d.secureFingerprint) {
                 d.startUnlock(false /* toTheRight */); // use normal login instead
             }
-            var msg = d.secureFingerprint ? i18n.tr("Try again") : "";
+            var msg = d.secureFingerprint ? i18n.tr("Try again") :
+                      d.alphanumeric ? i18n.tr("Enter passphrase to unlock") :
+                                       i18n.tr("Enter passcode to unlock");
             d.showFingerprintMessage(msg);
         }
 
@@ -609,8 +580,7 @@
             }
             console.log("Identified user by fingerprint:", result);
             if (loader.item) {
-                loader.item.enabled = false;
-                loader.item.notifyAuthenticationSucceeded(true /* showFakePassword */);
+                loader.item.showFakePassword();
             }
             if (root.active)
                 root.forcedUnlock = true;
 
=== modified file 'qml/Greeter/GreeterPrompt.qml'
--- qml/Greeter/GreeterPrompt.qml	2016-09-22 10:33:39 +0000
+++ qml/Greeter/GreeterPrompt.qml	2017-01-25 16:04:08 +0000
@@ -27,31 +27,25 @@
     property bool isAlphanumeric
     property string text
     property bool isSecret
+    property bool interactive: true
+    readonly property alias enteredText: passwordInput.text
 
     signal clicked()
     signal canceled()
-    signal responded(string text)
-
-    function reset() {
-        passwordInput.text = "";
-        fakeLabel.text = "";
-        d.enabled = true;
-    }
+    signal accepted()
 
     function showFakePassword() {
         // Just a silly hack for looking like 4 pin numbers got entered, if
         // a fingerprint was used and we happen to be using a pin.  This was
         // a request from Design.
         if (isSecret && isPrompt && !isAlphanumeric) {
-            d.enabled = false;
-            text = "...."; // actual text doesn't matter
+            passwordInput.text = "...."; // actual text doesn't matter
         }
     }
 
     StyledItem {
         id: d
 
-        property bool enabled: true
         readonly property color textColor: passwordInput.enabled ? theme.palette.normal.raisedText
                                                                  : theme.palette.disabled.raisedText
         readonly property color selectedColor: passwordInput.enabled ? theme.palette.normal.raised
@@ -60,12 +54,6 @@
                                                                  : theme.palette.disabled.raisedSecondaryText
         readonly property color errorColor: passwordInput.enabled ? theme.palette.normal.negative
                                                                   : theme.palette.disabled.negative
-
-        onEnabledChanged: {
-            if (!enabled) {
-                fakeLabel.text = passwordInput.displayText;
-            }
-        }
     }
 
     Rectangle {
@@ -86,15 +74,17 @@
         }
     }
 
-    Rectangle {
+    StyledItem {
         id: promptButton
         objectName: "promptButton"
         anchors.fill: parent
         visible: !root.isPrompt
+        activeFocusOnTab: true
+
+        styleName: "FocusShape"
 
         function triggered() {
-            if (d.enabled) {
-                d.enabled = false;
+            if (root.interactive) {
                 root.clicked();
             }
         }
@@ -109,6 +99,7 @@
             }
         }
 
+        Keys.onSpacePressed: triggered();
         Keys.onReturnPressed: triggered();
         Keys.onEnterPressed: triggered();
         MouseArea {
@@ -129,6 +120,7 @@
         anchors.fill: parent
         visible: root.isPrompt
         opacity: fakeLabel.visible ? 0 : 1
+        activeFocusOnTab: true
 
         validator: RegExpValidator {
             regExp: root.isAlphanumeric ? /^.*$/ : /^\d{4}$/
@@ -142,15 +134,23 @@
 
         readonly property real frameSpacing: units.gu(0.5)
 
-        style: Item {
-            property color color: d.textColor
-            property color selectedTextColor: d.selectedColor
-            property color selectionColor: d.textColor
-            property color borderColor: "transparent"
-            property color backgroundColor: "transparent"
-            property color errorColor: d.errorColor
-            property real frameSpacing: passwordInput.frameSpacing
+        style: StyledItem {
             anchors.fill: parent
+            styleName: "FocusShape"
+
+            // Properties needed by TextField
+            readonly property color color: d.textColor
+            readonly property color selectedTextColor: d.selectedColor
+            readonly property color selectionColor: d.textColor
+            readonly property color borderColor: "transparent"
+            readonly property color backgroundColor: "transparent"
+            readonly property color errorColor: d.errorColor
+            readonly property real frameSpacing: styledItem.frameSpacing
+
+            // Properties needed by FocusShape
+            readonly property bool enabled: styledItem.enabled
+            readonly property bool keyNavigationFocus: styledItem.keyNavigationFocus
+            property bool activeFocusOnTab
         }
 
         secondaryItem: [
@@ -178,9 +178,8 @@
         onAccepted: respond()
 
         function respond() {
-            if (d.enabled) {
-                d.enabled = false;
-                root.responded(text);
+            if (root.interactive) {
+                root.accepted();
             }
         }
 
@@ -194,6 +193,7 @@
         // palette color, whereas we want raisedSecondaryText.
         Label {
             id: hint
+            objectName: "promptHint"
             anchors {
                 left: parent.left
                 right: parent.right
@@ -223,6 +223,7 @@
         anchors.leftMargin: passwordInput.frameSpacing * 2
         anchors.rightMargin: passwordInput.frameSpacing * 2 + capsIcon.visibleWidth
         color: d.drawColor
-        visible: root.isPrompt && !d.enabled
+        text: passwordInput.displayText
+        visible: root.isPrompt && !root.interactive
     }
 }
 
=== modified file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2015-11-19 21:47:32 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	2017-01-25 16:04:08 +0000
@@ -22,6 +22,7 @@
 
     property var greeter: LightDM.Greeter
     property var infographic: LightDM.Infographic
+    property var prompts: LightDM.Prompts
     property var sessions: LightDM.Sessions
     property var sessionRoles: LightDM.SessionRoles
     property var users: LightDM.Users
 
=== modified file 'qml/Greeter/LightDMService.qml'
--- qml/Greeter/LightDMService.qml	2015-11-19 21:47:32 +0000
+++ qml/Greeter/LightDMService.qml	2017-01-25 16:04:08 +0000
@@ -27,6 +27,7 @@
 
     property var greeter: d.valid ? loader.item.greeter : null
     property var infographic: d.valid ? loader.item.infographic : null
+    property var prompts: d.valid ? loader.item.prompts : null
     property var sessions: d.valid ? loader.item.sessions : null
     property var sessionRoles: d.valid ? loader.item.sessionRoles : null
     property var users: d.valid ? loader.item.users : null
@@ -35,10 +36,9 @@
     // This trickery handles cases where applicationArguments aren't provided
     // such as during testing
     property var fullLightDM: {
-        if (typeof applicationArguments !== "undefined") {
-            if (applicationArguments.mode === "greeter") {
-                return true;
-            }
+        if (typeof applicationArguments === "undefined" ||
+                applicationArguments.mode === "greeter") {
+            return true;
         }
         return false;
     }
 
=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2016-11-29 00:13:45 +0000
+++ qml/Greeter/LoginList.qml	2017-01-25 16:04:08 +0000
@@ -25,95 +25,50 @@
     focus: true
 
     property alias model: userList.model
-    property bool alphanumeric: true
+    property alias alphanumeric: promptList.alphanumeric
     property int currentIndex
     property bool locked
     property bool waiting
     property alias boxVerticalOffset: highlightItem.y
 
-    readonly property alias passwordInput: passwordInput
     readonly property int numAboveBelow: 4
     readonly property int cellHeight: units.gu(5)
-    readonly property int highlightedHeight: units.gu(15)
+    readonly property int highlightedHeight: highlightItem.height
     readonly property int moveDuration: UbuntuAnimation.FastDuration
-    property string selectedSession
     property string currentSession
     readonly property string currentUser: userList.currentItem.username
-    property bool wasPrompted: false
 
-    signal loginListSessionChanged(string session)
     signal responded(string response)
     signal selected(int index)
     signal sessionChooserButtonClicked()
 
     function tryToUnlock() {
-        if (wasPrompted) {
-            passwordInput.forceActiveFocus();
-        } else {
-            if (root.locked) {
-                root.selected(currentIndex);
-            } else {
-                root.responded("");
-            }
-        }
-    }
-
-    function showMessage(html) {
-        if (infoLabel.text === "") {
-            infoLabel.text = html;
-        } else {
-            infoLabel.text += "<br>" + html;
-        }
-    }
-
-    function showPrompt(text, isSecret, isDefaultPrompt) {
-        passwordInput.text = isDefaultPrompt ? alphanumeric ? i18n.tr("Passphrase")
-                                                            : i18n.tr("Passcode")
-                                             : text;
-        passwordInput.isPrompt = true;
-        passwordInput.isSecret = isSecret;
-        passwordInput.reset();
-        wasPrompted = true;
+        promptList.forceActiveFocus();
     }
 
     function showError() {
         wrongPasswordAnimation.start();
-        root.resetAuthentication();
-    }
-
-    function reset() {
-        root.resetAuthentication();
     }
 
     function showFakePassword() {
-        passwordInput.showFakePassword();
-    }
-
-    QtObject {
-        id: d
-
-        function checkIfPromptless() {
-            if (!waiting && !wasPrompted) {
-                passwordInput.isPrompt = false;
-                passwordInput.text = root.locked ? i18n.tr("Retry")
-                                                 : i18n.tr("Log In")
-            }
-        }
-    }
-
-    onWaitingChanged: d.checkIfPromptless()
-    onLockedChanged: d.checkIfPromptless()
+        promptList.interactive = false;
+        promptList.showFakePassword();
+    }
 
     theme: ThemeSettings {
         name: "Ubuntu.Components.Themes.Ambiance"
     }
 
     Keys.onUpPressed: {
-        selected(currentIndex - 1);
+        if (currentIndex > 0) {
+            selected(currentIndex - 1);
+        }
         event.accepted = true;
     }
     Keys.onDownPressed: {
-        selected(currentIndex + 1);
+        if (currentIndex + 1 < model.count) {
+            selected(currentIndex + 1);
+        }
         event.accepted = true;
     }
     Keys.onEscapePressed: {
@@ -135,7 +90,8 @@
             rightMargin: units.gu(2)
         }
 
-        height: root.highlightedHeight
+        height: Math.max(units.gu(15), promptList.height + units.gu(8))
+        Behavior on height { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }
     }
 
     ListView {
@@ -153,14 +109,8 @@
         interactive: count > 1
 
         readonly property bool movingInternally: moveTimer.running || userList.moving
-        onMovingInternallyChanged: {
-            if (!movingInternally) {
-                root.selected(currentIndex);
-            }
-        }
 
         onCurrentIndexChanged: {
-            root.resetAuthentication();
             moveTimer.start();
         }
 
@@ -203,7 +153,10 @@
                     // Add an offset to bottomMargin for any items below the highlight
                     bottomMargin: -(units.gu(4) + (parent.belowHighlight ? parent.belowOffset : 0))
                 }
-                text: realName
+                text: userList.currentIndex === index
+                      && name === "*other"
+                      && LightDMService.greeter.authenticationUser !== ""
+                      ?  LightDMService.greeter.authenticationUser : realName
                 color: userList.currentIndex !== index ? theme.palette.normal.raised
                                                        : theme.palette.normal.raisedText
 
@@ -309,64 +262,42 @@
         }
     }
 
-    FadingLabel {
-        id: infoLabel
-        objectName: "infoLabel"
-        anchors {
-            bottom: passwordInput.top
-            left: highlightItem.left
-            topMargin: units.gu(1)
-            bottomMargin: units.gu(1)
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(1)
-        }
-
-        color: theme.palette.normal.raisedText
-        width: root.width - anchors.leftMargin - anchors.rightMargin
-        fontSize: "small"
-        textFormat: Text.StyledText
-
-        opacity: (userList.movingInternally || text == "") ? 0 : 1
-        Behavior on opacity {
-            NumberAnimation { duration: 100 }
-        }
-    }
-
-    GreeterPrompt {
-        id: passwordInput
-        objectName: "passwordInput"
+    PromptList {
+        id: promptList
+        objectName: "promptList"
         anchors {
             bottom: highlightItem.bottom
             horizontalCenter: highlightItem.horizontalCenter
             margins: units.gu(2)
         }
         width: highlightItem.width - anchors.margins * 2
-        opacity: userList.movingInternally ? 0 : 1
-
-        activeFocusOnTab: true
-        isAlphanumeric: root.alphanumeric
-
-        onClicked: root.tryToUnlock()
-        onResponded: root.responded(text)
-        onCanceled: root.selected(currentIndex)
-
-        Behavior on opacity {
-            NumberAnimation { duration: 100 }
-        }
-
-        WrongPasswordAnimation {
-            id: wrongPasswordAnimation
-            objectName: "wrongPasswordAnimation"
-            target: passwordInput
+
+        onClicked: {
+            interactive = false;
+            if (root.locked) {
+                root.selected(currentIndex);
+            } else {
+                root.responded("");
+            }
+        }
+        onResponded: {
+            interactive = false;
+            root.responded(text);
+        }
+        onCanceled: {
+            interactive = false;
+            root.selected(currentIndex);
+        }
+
+        Connections {
+            target: LightDMService.prompts
+            onModelReset: promptList.interactive = true
         }
     }
 
-    function resetAuthentication() {
-        if (!userList.currentItem) {
-            return;
-        }
-        infoLabel.text = "";
-        passwordInput.reset();
-        root.wasPrompted = false;
+    WrongPasswordAnimation {
+        id: wrongPasswordAnimation
+        objectName: "wrongPasswordAnimation"
+        target: promptList
     }
 }
 
=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2016-08-30 20:23:15 +0000
+++ qml/Greeter/NarrowView.qml	2017-01-25 16:04:08 +0000
@@ -48,14 +48,6 @@
     signal tease()
     signal emergencyCall()
 
-    function showMessage(html) {
-        loginList.showMessage(html);
-    }
-
-    function showPrompt(text, isSecret, isDefaultPrompt) {
-        loginList.showPrompt(text, isSecret, isDefaultPrompt);
-    }
-
     function showLastChance() {
         /* TODO: when we finish support for resetting device after too many
                  failed logins, we should re-add this popup.
@@ -75,10 +67,8 @@
         coverPage.hide();
     }
 
-    function notifyAuthenticationSucceeded(showFakePassword) {
-        if (showFakePassword) {
-            loginList.showFakePassword();
-        }
+    function showFakePassword() {
+        loginList.showFakePassword();
     }
 
     function notifyAuthenticationFailed() {
@@ -89,11 +79,8 @@
         coverPage.showErrorMessage(msg);
     }
 
-    function reset(forceShow) {
-        loginList.reset();
-        if (forceShow) {
-            coverPage.show();
-        }
+    function forceShow() {
+        coverPage.show();
     }
 
     function tryToUnlock(toTheRight) {
@@ -120,6 +107,7 @@
         objectName: "lockscreen"
         anchors.fill: parent
         shown: false
+        opacity: 0
 
         showAnimation: StandardAnimation { property: "opacity"; to: 1 }
         hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
@@ -195,10 +183,12 @@
         onClicked: hide()
 
         onShowProgressChanged: {
-            if (showProgress === 1) {
-                loginList.reset();
-            } else if (showProgress === 0) {
-                loginList.tryToUnlock();
+            if (showProgress === 0) {
+                if (lockscreen.shown) {
+                    loginList.tryToUnlock();
+                } else {
+                    root.responded("");
+                }
             }
         }
 
 
=== added file 'qml/Greeter/PromptList.qml'
--- qml/Greeter/PromptList.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/PromptList.qml	2017-01-25 16:04:08 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2017 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import "../Components"
+import "." 0.1
+
+FocusScope {
+    id: root
+    height: childrenRect.height
+
+    property bool alphanumeric: true
+    property bool interactive: true
+
+    signal responded(string text)
+    signal clicked()
+    signal canceled()
+
+    function showFakePassword() {
+        for (var i = 0; i < repeater.count; i++) {
+            var item = repeater.itemAt(i).item;
+            if (item.isPrompt) {
+                item.showFakePassword();
+            }
+        }
+    }
+
+    QtObject {
+        id: d
+
+        function sendResponse() {
+            for (var i = 0; i < repeater.count; i++) {
+                var item = repeater.itemAt(i).item;
+                if (item.isPrompt) {
+                    root.responded(item.enteredText);
+                }
+            }
+        }
+    }
+
+    Column {
+        width: parent.width
+        spacing: units.gu(0.5)
+
+        Repeater {
+            id: repeater
+            model: LightDMService.prompts
+
+            delegate: Loader {
+                id: loader
+
+                readonly property bool isLabel: model.type == LightDMService.prompts.Message ||
+                                                model.type == LightDMService.prompts.Error
+                readonly property var modelData: model
+
+                sourceComponent: isLabel ? infoLabel : greeterPrompt
+
+                onLoaded: {
+                    for (var i = 0; i < repeater.count; i++) {
+                        var item = repeater.itemAt(i);
+                        if (item && !item.isLabel) {
+                            item.focus = true;
+                            break;
+                        }
+                    }
+                    loader.item.opacity = 1;
+                }
+
+                Binding {
+                    target: loader.item
+                    property: "model"
+                    value: loader.modelData
+                }
+            }
+        }
+    }
+
+    Component {
+        id: infoLabel
+
+        FadingLabel {
+            objectName: "infoLabel" + model.index
+            width: root.width
+
+            property var model
+            readonly property bool isPrompt: false
+
+            color: model.type === LightDMService.prompts.Message ? theme.palette.normal.raisedText
+                                                          : theme.palette.normal.negative
+            fontSize: "small"
+            textFormat: Text.PlainText
+            text: model.text
+
+            Behavior on opacity { UbuntuNumberAnimation {} }
+            opacity: 0
+        }
+    }
+
+    Component {
+        id: greeterPrompt
+
+        GreeterPrompt {
+            objectName: "greeterPrompt" + model.index
+            width: root.width
+
+            property var model
+
+            interactive: root.interactive
+            isAlphanumeric: model.text !== "" || root.alphanumeric
+            isPrompt: model.type !== LightDMService.prompts.Button
+            isSecret: model.type === LightDMService.prompts.Secret
+            text: model.text ? model.text : (isAlphanumeric ? i18n.tr("Passphrase") : i18n.tr("Passcode"))
+
+            onClicked: root.clicked()
+            onAccepted: {
+                // If there is another GreeterPrompt, focus it.
+                for (var i = model.index + 1; i < repeater.count; i++) {
+                    var item = repeater.itemAt(i).item;
+                    if (item.isPrompt) {
+                        item.forceActiveFocus();
+                        return;
+                    }
+                }
+
+                // Nope we're the last one; just send our response.
+                d.sendResponse();
+            }
+            onCanceled: root.canceled()
+
+            Behavior on opacity { UbuntuNumberAnimation {} }
+            opacity: 0
+        }
+    }
+}
 
=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2016-11-29 00:13:45 +0000
+++ qml/Greeter/WideView.qml	2017-01-25 16:04:08 +0000
@@ -52,16 +52,8 @@
         loginList.showError();
     }
 
-    function reset(forceShow) {
-        loginList.reset();
-    }
-
-    function showMessage(html) {
-        loginList.showMessage(html);
-    }
-
-    function showPrompt(text, isSecret, isDefaultPrompt) {
-        loginList.showPrompt(text, isSecret, isDefaultPrompt);
+    function forceShow() {
+        // Nothing to do, we are always fully shown
     }
 
     function tryToUnlock(toTheRight) {
@@ -84,10 +76,8 @@
         coverPage.hide();
     }
 
-    function notifyAuthenticationSucceeded(showFakePassword) {
-        if (showFakePassword) {
-            loginList.showFakePassword();
-        }
+    function showFakePassword() {
+        loginList.showFakePassword();
     }
 
     function showLastChance() {
@@ -125,8 +115,6 @@
             id: loginList
             objectName: "loginList"
 
-            property int selectedUserIndex: 0
-
             width: units.gu(40)
             anchors {
                 left: parent.left
@@ -141,15 +129,18 @@
             Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
 
             model: root.userModel
-            currentSession: LightDMService.users.data(selectedUserIndex, LightDMService.userRoles.SessionRole);
             onResponded: root.responded(response)
-            onSelected: {
-                root.selected(index)
-                loginList.selectedUserIndex = index;
-            }
+            onSelected: root.selected(index)
             onSessionChooserButtonClicked: parent.state = "SessionsList"
+            onCurrentIndexChanged: setCurrentSession()
 
             Keys.forwardTo: [sessionChooserLoader.item]
+
+            Component.onCompleted: setCurrentSession()
+
+            function setCurrentSession() {
+                currentSession = LightDMService.users.data(currentIndex, LightDMService.userRoles.SessionRole);
+            }
         }
 
         Loader {
@@ -177,7 +168,7 @@
                 onSessionSelected: loginList.currentSession = sessionKey
                 onShowLoginList: {
                     coverPage.state = "LoginList"
-                    loginList.passwordInput.forceActiveFocus();
+                    loginList.tryToUnlock();
                 }
                 ignoreUnknownSignals: true
             }
 
=== modified file 'qml/Launcher/Drawer.qml'
--- qml/Launcher/Drawer.qml	2016-11-28 10:17:22 +0000
+++ qml/Launcher/Drawer.qml	2017-01-25 16:04:08 +0000
@@ -20,6 +20,7 @@
 import Utils 0.1
 import "../Components"
 import Qt.labs.settings 1.0
+import GSettings  1.0
 
 FocusScope {
     id: root
@@ -43,6 +44,16 @@
         searchField.focus = true;
     }
 
+    Keys.onPressed: {
+        if (event.text.trim() !== "") {
+            focusInput();
+            searchField.text = event.text;
+        }
+        // Catch all presses here in case the navigation lets something through
+        // We never want to end up in the launcher with focus
+        event.accepted = true;
+    }
+
     Settings {
         property alias selectedTab: sections.selectedIndex
     }
@@ -76,9 +87,13 @@
 
             TextField {
                 id: searchField
+                objectName: "searchField"
                 anchors { left: parent.left; top: parent.top; right: parent.right; margins: units.gu(1) }
                 placeholderText: i18n.tr("Search…")
                 focus: true
+
+                KeyNavigation.down: sections
+
                 onAccepted: {
                     if (searchField.displayText != "" && listLoader.item && listLoader.item.currentItem) {
                         root.applicationSelected(listLoader.item.getFirstAppId());
@@ -95,7 +110,14 @@
 
                 Sections {
                     id: sections
+                    objectName: "drawerSections"
                     width: parent.width
+
+                    KeyNavigation.up: searchField
+                    KeyNavigation.down: headerFocusScope
+                    KeyNavigation.backtab: searchField
+                    KeyNavigation.tab: headerFocusScope
+
                     actions: [
                         Action {
                             text: i18n.ctr("Apps sorted alphabetically", "A-Z")
@@ -115,9 +137,45 @@
                 }
             }
 
+            FocusScope {
+                id: headerFocusScope
+                objectName: "headerFocusScope"
+                KeyNavigation.up: sections
+                KeyNavigation.down: listLoader.item
+                KeyNavigation.backtab: sections
+                KeyNavigation.tab: listLoader.item
+                activeFocusOnTab: true
+
+                GSettings {
+                    id: settings
+                    schema.id: "com.canonical.Unity8"
+                }
+
+                Keys.onPressed: {
+                    switch (event.key) {
+                    case Qt.Key_Return:
+                    case Qt.Key_Enter:
+                    case Qt.Key_Space:
+                        trigger();
+                        event.accepted = true;
+                    }
+                }
+
+                function trigger() {
+                    Qt.openUrlExternally(settings.appstoreUri)
+                }
+            }
+
             Loader {
                 id: listLoader
-                anchors { left: parent.left; top: sectionsContainer.bottom; right: parent.right; bottom: parent.bottom; leftMargin: units.gu(1); rightMargin: units.gu(1) }
+                objectName: "drawerListLoader"
+                anchors { left: parent.left; top: sectionsContainer.bottom; right: parent.right; bottom: parent.bottom }
+
+                KeyNavigation.up: headerFocusScope
+                KeyNavigation.down: searchField
+                KeyNavigation.backtab: headerFocusScope
+                KeyNavigation.tab: searchField
+
                 sourceComponent: {
                     switch (sections.selectedIndex) {
                     case 0: return aToZComponent;
@@ -167,10 +225,13 @@
             Component {
                 id: mostUsedComponent
                 DrawerListView {
+                    id: mostUsedListView
 
                     header: MoreAppsHeader {
                         width: parent.width
                         height: units.gu(6)
+                        highlighted: headerFocusScope.activeFocus
+                        onClicked: headerFocusScope.trigger();
                     }
 
                     model: AppDrawerProxyModel {
@@ -180,7 +241,8 @@
                     }
 
                     delegate: UbuntuShape {
-                        width: parent.width
+                        width: parent.width - units.gu(2)
+                        anchors.horizontalCenter: parent.horizontalCenter
                         color: "#20ffffff"
                         aspect: UbuntuShape.Flat
                         // NOTE: Cannot use gridView.rows here as it would evaluate to 0 at first and only update later,
@@ -196,6 +258,9 @@
                             bottomMargin: units.gu(1)
                             clip: true
 
+                            interactive: true
+                            focus: index == mostUsedListView.currentIndex
+
                             model: sortProxyModel
 
                             delegateWidth: units.gu(8)
@@ -209,10 +274,13 @@
             Component {
                 id: aToZComponent
                 DrawerListView {
+                    id: aToZListView
 
                     header: MoreAppsHeader {
                         width: parent.width
                         height: units.gu(6)
+                        highlighted: headerFocusScope.activeFocus
+                        onClicked: headerFocusScope.trigger();
                     }
 
                     model: AppDrawerProxyModel {
@@ -222,7 +290,8 @@
                     }
 
                     delegate: UbuntuShape {
-                        width: parent.width
+                        width: parent.width - units.gu(2)
+                        anchors.horizontalCenter: parent.horizontalCenter
                         color: "#20ffffff"
                         aspect: UbuntuShape.Flat
 
@@ -244,7 +313,8 @@
                             anchors { left: parent.left; top: categoryNameLabel.bottom; right: parent.right; topMargin: units.gu(1) }
                             height: rows * delegateHeight
 
-                            interactive: false
+                            interactive: true
+                            focus: index == aToZListView.currentIndex
 
                             model: AppDrawerProxyModel {
                                 id: categoryModel
@@ -263,10 +333,13 @@
         Component {
             id: drawerDelegateComponent
             AbstractButton {
+                id: drawerDelegate
                 width: GridView.view.cellWidth
                 height: units.gu(10)
                 objectName: "drawerItem_" + model.appId
 
+                readonly property bool focused: index === GridView.view.currentIndex && GridView.view.activeFocus
+
                 onClicked: root.applicationSelected(model.appId)
 
                 Column {
@@ -290,6 +363,15 @@
                             source: model.icon
                         }
                         sourceFillMode: UbuntuShape.PreserveAspectCrop
+
+                        StyledItem {
+                            styleName: "FocusShape"
+                            anchors.fill: parent
+                            StyleHints {
+                                visible: drawerDelegate.focused
+                                radius: units.gu(2.55)
+                            }
+                        }
                     }
 
                     Label {
 
=== modified file 'qml/Launcher/DrawerGridView.qml'
--- qml/Launcher/DrawerGridView.qml	2016-11-10 14:39:18 +0000
+++ qml/Launcher/DrawerGridView.qml	2017-01-25 16:04:08 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.4
 import "../Components"
 
-Item {
+FocusScope {
     id: root
 
     property int delegateWidth: units.gu(10)
@@ -25,6 +25,7 @@
     property alias delegate: gridView.delegate
     property alias model: gridView.model
     property alias interactive: gridView.interactive
+    property alias currentIndex: gridView.currentIndex
 
     property alias header: gridView.header
     property alias topMargin: gridView.topMargin
@@ -37,6 +38,7 @@
         id: gridView
         anchors.fill: parent
         leftMargin: spacing
+        focus: true
 
         readonly property int overflow: width - (root.columns * root.delegateWidth)
         readonly property real spacing: overflow / (root.columns)
 
=== modified file 'qml/Launcher/DrawerListView.qml'
--- qml/Launcher/DrawerListView.qml	2016-11-28 14:56:02 +0000
+++ qml/Launcher/DrawerListView.qml	2017-01-25 16:04:08 +0000
@@ -25,6 +25,12 @@
     bottomMargin: units.gu(1)
     spacing: units.gu(1)
     clip: true
+    focus: true
+
+    onActiveFocusChanged: {
+        currentIndex = -1;
+        currentIndex = 0;
+    }
 
     function getFirstAppId() {
         return model.appId(0);
 
=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2016-12-07 13:47:15 +0000
+++ qml/Launcher/Launcher.qml	2017-01-25 16:04:08 +0000
@@ -74,7 +74,7 @@
         } else {
             superPressTimer.stop();
             superLongPressTimer.stop();
-            launcher.switchToNextState("");
+            switchToNextState("");
             panel.shortcutHintsShown = false;
         }
     }
@@ -87,14 +87,14 @@
             superPressTimer.stop();
             superLongPressTimer.stop();
         } else {
+            switchToNextState("");
+            root.focus = false;
             if (panel.highlightIndex == -1) {
-                showDashHome();
+                root.showDashHome();
             } else if (panel.highlightIndex >= 0){
                 launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
             }
             panel.highlightIndex = -2;
-            switchToNextState("");
-            root.focus = false;
         }
     }
 
@@ -108,6 +108,10 @@
         }
     }
 
+    onPanelWidthChanged: {
+        hint();
+    }
+
     function hide(flags) {
         if ((flags & ignoreHideIfMouseOverLauncher) && Utils.Functions.itemUnderMouse(panel)) {
             return;
@@ -206,7 +210,7 @@
         case Qt.Key_Return:
         case Qt.Key_Space:
             if (panel.highlightIndex == -1) {
-                showDashHome();
+                root.showDashHome();
             } else if (panel.highlightIndex >= 0) {
                 launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
             }
@@ -469,7 +473,7 @@
         }
         onPassed: {
             if (root.drawerEnabled) {
-                root.switchToNextState("drawer");
+                root.openDrawer()
             }
         }
 
@@ -545,8 +549,7 @@
             if (!dragging) {
                 if (distance > panel.width / 2) {
                     if (root.drawerEnabled && distance > panel.width * 3 && dragDirection() !== "left") {
-                        root.switchToNextState("drawer");
-                        root.focus = true;
+                        root.openDrawer(false)
                     } else {
                         root.switchToNextState("visible");
                     }
 
=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2016-09-26 11:58:56 +0000
+++ qml/Launcher/LauncherDelegate.qml	2017-01-25 16:04:08 +0000
@@ -124,15 +124,14 @@
         height: parent.itemHeight + units.gu(1)
         anchors.centerIn: parent
 
-        Image {
-            objectName: "focusRing"
-            anchors.centerIn: iconShape
-            height: width * 15 / 16
-            width: iconShape.width + units.gu(1)
-            source: "graphics/launcher-app-focus-ring.svg"
-            sourceSize.width: width
-            sourceSize.height: height
-            visible: root.highlighted
+        StyledItem {
+            styleName: "FocusShape"
+            anchors.fill: iconShape
+            activeFocusOnTab: true
+            StyleHints {
+                visible: root.highlighted
+                radius: units.gu(2.55)
+            }
         }
 
         ProportionalShape {
 
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2017-01-10 14:44:00 +0000
+++ qml/Launcher/LauncherPanel.qml	2017-01-25 16:04:08 +0000
@@ -80,6 +80,7 @@
         }
 
         Rectangle {
+            id: bfb
             objectName: "buttonShowDashHome"
             width: parent.width
             height: width * .9
@@ -100,13 +101,15 @@
                 activeFocusOnPress: false
                 onClicked: root.showDashHome()
             }
-            Rectangle {
-                objectName: "bfbFocusHighlight"
+
+            StyledItem {
+                styleName: "FocusShape"
                 anchors.fill: parent
-                border.color: "white"
-                border.width: units.dp(1)
-                color: "transparent"
-                visible: parent.highlighted
+                anchors.margins: units.gu(.5)
+                StyleHints {
+                    visible: bfb.highlighted
+                    radius: 0
+                }
             }
         }
 
@@ -788,6 +791,8 @@
             quickList.model = launcherListView.model.get(index).quickList;
             quickList.appId = launcherListView.model.get(index).appId;
             quickList.state = "open";
+            root.highlightIndex = index;
+            quickList.forceActiveFocus();
         }
 
         Item {
 
=== modified file 'qml/Launcher/MoreAppsHeader.qml'
--- qml/Launcher/MoreAppsHeader.qml	2016-11-04 10:10:26 +0000
+++ qml/Launcher/MoreAppsHeader.qml	2017-01-25 16:04:08 +0000
@@ -4,17 +4,24 @@
 AbstractButton {
     id: root
 
-    onClicked: {
-        // TODO: Make this point to the snappy store as soon as we stop landing to vivid
-        Qt.openUrlExternally("scope://com.canonical.scopes.clickstore")
-    }
+    property bool highlighted: false
 
     UbuntuShape {
-        width: parent.width
+        width: parent.width - units.gu(2)
+        anchors.horizontalCenter: parent.horizontalCenter
         height: parent.height - units.gu(1)
         color: "#20ffffff"
         aspect: UbuntuShape.Flat
 
+        StyledItem {
+            styleName: "FocusShape"
+            anchors.fill: parent
+            activeFocusOnTab: true
+            StyleHints {
+                visible: root.highlighted
+            }
+        }
+
         Row {
             anchors.fill: parent
             anchors.margins: units.gu(1)
 
=== removed file 'qml/Launcher/graphics/launcher-app-focus-ring.svg'
--- qml/Launcher/graphics/launcher-app-focus-ring.svg	2015-12-15 12:53:53 +0000
+++ qml/Launcher/graphics/launcher-app-focus-ring.svg	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="172px" height="163px" viewBox="0 0 172 163" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
-    <title>Shape</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="•-Launcher" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Artboard-9" sketch:type="MSArtboardGroup" transform="translate(-163.000000, -1436.000000)" fill="#E95420">
-            <path d="M221.983432,1440 L221.983432,1440 C195.6127,1440 184.708233,1442.4723 177.107949,1450.10734 C169.476819,1457.77336 167,1468.79245 167,1495.3481 L167,1538.9019 C167,1565.45755 169.476819,1576.47664 177.107949,1584.14266 C184.708233,1591.7777 195.6127,1594.25 221.983432,1594.25 L276.016868,1594.25 C302.387595,1594.25 313.291998,1591.77771 320.892221,1584.14264 C328.523252,1576.47663 331,1565.45769 331,1538.9019 L331,1495.3481 C331,1468.79231 328.523252,1457.77337 320.892221,1450.10736 C313.291998,1442.47229 302.387595,1440 276.016868,1440 L221.983432,1440 Z M221.983432,1436 L276.016868,1436 C302.345315,1436 314.848953,1438.36655 323.727108,1447.2854 C332.633306,1456.23243 335,1468.85167 335,1495.3481 L335,1538.9019 C335,1565.39833 332.633306,1578.01757 323.727108,1586.9646 C314.848953,1595.88345 302.345315,1598.25 276.016868,1598.25 L221.983432,1598.25 C195.654985,1598.25 183.151291,1595.88345 174.273077,1586.96463 C165.366772,1578.0176 163,1565.39822 163,1538.9019 L163,1495.3481 C163,1468.85178 165.366772,1456.2324 174.273077,1447.28537 C183.151291,1438.36655 195.654985,1436 221.983432,1436 L221.983432,1436 Z" id="Shape" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>
 \ No newline at end of file
 
=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2016-12-13 09:56:20 +0000
+++ qml/OrientedShell.qml	2017-01-25 16:04:08 +0000
@@ -266,7 +266,8 @@
         nativeWidth: root.width
         nativeHeight: root.height
         mode: applicationArguments.mode
-        hasMouse: miceModel.count + touchPadModel.count > 0
+        hasMouse: pointerInputDevices > 0
+        hasKeyboard: keyboardsModel.count > 0
         // TODO: Factor in if the current screen is a touch screen and if the user wants to
         //       have multiple keyboards around. For now we only enable one keyboard at a time
         //       thus hiding it here if there is a physical one around or if we have a second
 
=== modified file 'qml/Panel/PanelBar.qml'
--- qml/Panel/PanelBar.qml	2016-09-30 14:27:30 +0000
+++ qml/Panel/PanelBar.qml	2017-01-25 16:04:08 +0000
@@ -49,6 +49,7 @@
             row.resetCurrentItem();
         }
         row.setCurrentItemIndex(index);
+        d.alignIndicators();
     }
 
     function addScrollOffset(scrollAmmout) {
 
=== modified file 'qml/Panel/PanelMenu.qml'
--- qml/Panel/PanelMenu.qml	2016-12-22 14:55:39 +0000
+++ qml/Panel/PanelMenu.qml	2017-01-25 16:04:08 +0000
@@ -140,6 +140,19 @@
         visible: !root.fullyClosed
     }
 
+    Keys.onPressed: {
+        if (event.key === Qt.Key_Left) {
+            bar.setCurrentItemIndex(bar.currentItemIndex - 1);
+            event.accepted = true;
+        } else if (event.key === Qt.Key_Right) {
+            bar.setCurrentItemIndex(bar.currentItemIndex + 1);
+            event.accepted = true;
+        } else if (event.key === Qt.Key_Escape) {
+            root.hide();
+            event.accepted = true;
+        }
+    }
+
     PanelBar {
         id: bar
         objectName: "indicatorsBar"
@@ -368,6 +381,7 @@
         State {
             name: "commit"
             extend: "locked"
+            PropertyChanges { target: root; focus: true }
             PropertyChanges { target: bar; interactive: true }
             PropertyChanges {
                 target: d;
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2017-01-03 12:04:08 +0000
+++ qml/Shell.qml	2017-01-25 16:04:08 +0000
@@ -68,6 +68,7 @@
         stage.updateFocusedAppOrientationAnimated();
     }
     property bool hasMouse: false
+    property bool hasKeyboard: false
 
     // to be read from outside
     readonly property int mainAppWindowOrientationAngle: stage.mainAppWindowOrientationAngle
@@ -240,7 +241,7 @@
             // Ignore when greeter is active, to avoid pocket presses
             if (!greeter.active) {
                 launcher.fadeOut();
-                shell.showHome();
+                ApplicationManager.requestFocusApplication("unity8-dash");
             }
         }
         onTouchBegun: { cursor.opacity = 0; }
@@ -319,6 +320,35 @@
                 panel.applicationMenus.hide();
             }
         }
+
+        TouchGestureArea {
+            anchors.fill: stage
+
+            minimumTouchPoints: 4
+            maximumTouchPoints: minimumTouchPoints
+
+            readonly property bool recognisedPress: status == TouchGestureArea.Recognized &&
+                                                    touchPoints.length >= minimumTouchPoints &&
+                                                    touchPoints.length <= maximumTouchPoints
+            property bool wasPressed: false
+
+            onRecognisedPressChanged: {
+                if (recognisedPress) {
+                    wasPressed = true;
+                }
+            }
+
+            onStatusChanged: {
+                if (status !== TouchGestureArea.Recognized) {
+                    if (status === TouchGestureArea.WaitingForTouch) {
+                        if (wasPressed && !dragging) {
+                            launcher.openDrawer(true);
+                        }
+                    }
+                    wasPressed = false;
+                }
+            }
+        }
     }
 
     InputMethod {
@@ -343,6 +373,16 @@
         onLoaded: {
             item.objectName = "greeter"
         }
+        property bool openDrawerAfterUnlock: false
+        Connections {
+            target: greeter
+            onActiveChanged: {
+                if (!greeter.active && greeterLoader.openDrawerAfterUnlock) {
+                    launcher.openDrawer(false);
+                    greeterLoader.openDrawerAfterUnlock = false;
+                }
+            }
+        }
     }
 
     Component {
@@ -434,9 +474,11 @@
         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");
+            if (!greeter.active) {
+                launcher.openDrawer(false);
+            } else {
+                greeterLoader.openDrawerAfterUnlock = true;
+            }
         }
     }
 
@@ -512,7 +554,7 @@
             lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher && !panel.fullscreenMode
             blurSource: greeter.shown ? greeter : stages
             topPanelHeight: panel.panelHeight
-            drawerEnabled: !greeter.shown
+            drawerEnabled: !greeter.active
 
             onShowDashHome: showHome()
             onLauncherApplicationSelected: {
@@ -657,8 +699,10 @@
         id: dialogs
         objectName: "dialogs"
         anchors.fill: parent
+        visible: hasActiveDialog
         z: overlay.z + 10
         usageScenario: shell.usageScenario
+        hasKeyboard: shell.hasKeyboard
         onPowerOffClicked: {
             shutdownFadeOutRectangle.enabled = true;
             shutdownFadeOutRectangle.visible = true;
 
=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2016-12-12 11:16:47 +0000
+++ qml/Stage/DecoratedWindow.qml	2017-01-25 16:04:08 +0000
@@ -196,18 +196,19 @@
         ]
     }
 
-    MouseArea {
+    WindowDecoration {
+        id: decoration
+        closeButtonVisible: root.application.appId !== "unity8-dash"
+        objectName: "appWindowDecoration"
+
         anchors { left: parent.left; top: parent.top; right: parent.right }
         height: units.gu(3)
 
+        title: applicationWindow.title
+
         opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
-
         Behavior on opacity { UbuntuNumberAnimation { } }
 
-        drag.target: Item {}
-        drag.filterChildren: true
-        drag.threshold: 0
-
         onPressed: root.decorationPressed();
         onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
         onPositionChanged: moveHandler.handlePositionChanged(mouse)
@@ -216,47 +217,39 @@
             moveHandler.handleReleased();
         }
 
-        WindowDecoration {
-            id: decoration
-            closeButtonVisible: root.application.appId !== "unity8-dash"
-            objectName: "appWindowDecoration"
-            anchors.fill: parent
-            title: applicationWindow.title
-
-            onCloseClicked: root.closeClicked();
-            onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
-            onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
-            onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
-            onMinimizeClicked: root.minimizeClicked();
-
-            enableMenus: {
-                return active &&
-                         surface &&
-                          (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
-            }
-            menu: sharedAppModel.model
-
-            Indicators.SharedUnityMenuModel {
-                id: sharedAppModel
-                property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
-                property var menuService: menus.length > 0 ? menus[0] : undefined
-
-                busName: menuService ? menuService.service : ""
-                menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
-                actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
-            }
-
-            Connections {
-                target: ApplicationMenuRegistry
-                onSurfaceMenuRegistered: {
-                    if (surface && surfaceId === surface.persistentId) {
-                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
-                    }
+        onCloseClicked: root.closeClicked();
+        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
+        onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
+        onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
+        onMinimizeClicked: root.minimizeClicked();
+
+        enableMenus: {
+            return active &&
+                     surface &&
+                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
+        }
+        menu: sharedAppModel.model
+
+        Indicators.SharedUnityMenuModel {
+            id: sharedAppModel
+            property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
+            property var menuService: menus.length > 0 ? menus[0] : undefined
+
+            busName: menuService ? menuService.service : ""
+            menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
+            actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
+        }
+
+        Connections {
+            target: ApplicationMenuRegistry
+            onSurfaceMenuRegistered: {
+                if (surface && surfaceId === surface.persistentId) {
+                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
                 }
-                onSurfaceMenuUnregistered: {
-                    if (surface && surfaceId === surface.persistentId) {
-                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
-                    }
+            }
+            onSurfaceMenuUnregistered: {
+                if (surface && surfaceId === surface.persistentId) {
+                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
                 }
             }
         }
 
=== modified file 'qml/Stage/WindowDecoration.qml'
--- qml/Stage/WindowDecoration.qml	2016-12-12 11:16:47 +0000
+++ qml/Stage/WindowDecoration.qml	2017-01-25 16:04:08 +0000
@@ -38,6 +38,10 @@
     acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
     hoverEnabled: true
 
+    drag.target: Item {}
+    drag.filterChildren: true
+    drag.threshold: 0
+
     signal closeClicked()
     signal minimizeClicked()
     signal maximizeClicked()
@@ -64,8 +68,8 @@
                                        (menuBar.showRequested || root.containsMouse)
     }
 
-    // We dont want touch events to fall through to parent,
-    // otherwise the containsMouse will not work.
+    // We dont want touch events to fall through to parent as it expect some child MouseArea to have them
+    // If not some MouseArea in the menu bar, it will be this one.
     MouseArea {
         anchors.fill: parent
         propagateComposedEvents: true
 
=== modified file 'src/MouseTouchAdaptor.cpp'
--- src/MouseTouchAdaptor.cpp	2016-03-29 03:47:39 +0000
+++ src/MouseTouchAdaptor.cpp	2017-01-25 16:04:08 +0000
@@ -72,6 +72,7 @@
 MouseTouchAdaptor *g_instance = nullptr;
 
 const Qt::KeyboardModifiers TRI_PRESS_MODIFIER = Qt::ShiftModifier|Qt::ControlModifier|Qt::AltModifier;
+const Qt::KeyboardModifiers QUAD_PRESS_MODIFIER = TRI_PRESS_MODIFIER|Qt::MetaModifier;
 
 Qt::MouseButton translateMouseButton(xcb_button_t detail)
 {
@@ -91,7 +92,7 @@
     if (mod & 0x01) qtMod |= Qt::ShiftModifier;
     if (mod & 0x04) qtMod |= Qt::ControlModifier;
     if (mod & 0x08) qtMod |= Qt::AltModifier;
-    if (mod & 0x80) qtMod |= Qt::MetaModifier;
+    if (mod & 0x40) qtMod |= Qt::MetaModifier;
 
     return qtMod;
 }
@@ -101,6 +102,7 @@
     : QObject(nullptr)
     , m_leftButtonIsPressed(false)
     , m_triPressModifier(false)
+    , m_quadPressModifier(false)
     , m_enabled(true)
 {
     QCoreApplication::instance()->installNativeEventFilter(this);
@@ -297,6 +299,13 @@
         touchEvent.press(2, windowPos);
         m_triPressModifier = true;
     }
+    if (qtMod == QUAD_PRESS_MODIFIER) {
+        touchEvent.press(1, windowPos);
+        touchEvent.press(2, windowPos);
+        touchEvent.press(3, windowPos);
+        m_quadPressModifier = true;
+    }
+
     touchEvent.commit(false /* processEvents */);
 
     m_leftButtonIsPressed = true;
@@ -322,10 +331,16 @@
         touchEvent.release(1, windowPos);
         touchEvent.release(2, windowPos);
     }
+    if (m_quadPressModifier) {
+        touchEvent.release(1, windowPos);
+        touchEvent.release(2, windowPos);
+        touchEvent.release(3, windowPos);
+    }
     touchEvent.commit(false /* processEvents */);
 
     m_leftButtonIsPressed = false;
     m_triPressModifier = false;
+    m_quadPressModifier = false;
     return true;
 }
 
@@ -354,6 +369,18 @@
             m_triPressModifier = false;
         }
     }
+    if (m_quadPressModifier) {
+        if (qtMod == QUAD_PRESS_MODIFIER) {
+            touchEvent.move(1, windowPos);
+            touchEvent.move(2, windowPos);
+            touchEvent.move(3, windowPos);
+        } else {
+            touchEvent.release(1, windowPos);
+            touchEvent.release(2, windowPos);
+            touchEvent.release(3, windowPos);
+            m_quadPressModifier = false;
+        }
+    }
     touchEvent.commit(false /* processEvents */);
 
     return true;
 
=== modified file 'src/MouseTouchAdaptor.h'
--- src/MouseTouchAdaptor.h	2016-03-29 03:47:39 +0000
+++ src/MouseTouchAdaptor.h	2017-01-25 16:04:08 +0000
@@ -59,6 +59,7 @@
     QTouchDevice *m_touchDevice;
     bool m_leftButtonIsPressed;
     bool m_triPressModifier;
+    bool m_quadPressModifier;
 
 
     bool m_enabled;
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-12-06 20:16:56 +0000
+++ tests/CMakeLists.txt	2017-01-25 16:04:08 +0000
@@ -7,8 +7,10 @@
 add_meta_test(uitests)
 add_meta_test(xvfbuitests)
 
-add_meta_test(alltests DEPENDS unittests uitests)
-add_meta_test(xvfballtests DEPENDS unittests xvfbuitests)
+# Run our meta-meta tests serially because we don't need to nest
+# parallelized tests.
+add_meta_test(alltests SERIAL DEPENDS unittests uitests)
+add_meta_test(xvfballtests SERIAL DEPENDS unittests xvfbuitests)
 
 # Support libraries and plugins
 add_subdirectory(mocks)
@@ -42,8 +44,8 @@
 
     set(ld_paths)
     list(APPEND ld_paths
+        ${UNITY_MOCKPATH}/liblightdm
         ${UNITY_MOCKPATH}/libusermetrics
-        ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
     )
 
     string(REPLACE ";" ":" ld_library_path "${ld_paths}")
 
=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-10-26 20:15:08 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2017-01-25 16:04:08 +0000
@@ -74,7 +74,7 @@
     def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "LightDM" ,"IntegratedLightDM", "liblightdm")
+            os.path.join(lib_path, "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):
 
=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2016-10-25 13:11:19 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2017-01-25 16:04:08 +0000
@@ -264,7 +264,7 @@
     def _get_lightdm_mock_path(self):
         lib_path = get_mocks_library_path()
         lightdm_mock_path = os.path.abspath(
-            os.path.join(lib_path, "LightDM" ,"IntegratedLightDM", "liblightdm")
+            os.path.join(lib_path, "liblightdm")
         )
 
         if not os.path.exists(lightdm_mock_path):
 
=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2016-08-04 14:05:54 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2017-01-25 16:04:08 +0000
@@ -15,7 +15,7 @@
  */
 
 #include "AccountsService.h"
-#include "MockUsersModel.h"
+#include "UsersModel.h"
 
 #include <QLightDM/UsersModel>
 #include <paths.h>
@@ -33,9 +33,8 @@
     m_demoEdgesCompleted(),
     m_hereEnabled(false),
     m_hereLicensePath(""),
-    m_usersModel(new MockUsersModel(this))
+    m_usersModel(new UsersModel(this))
 {
-    m_usersModel->setMockMode("full");
 }
 
 QString AccountsService::user() const
 
=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2016-12-23 11:04:53 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2017-01-25 16:04:08 +0000
@@ -14,15 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UNITY_MOCK_ACCOUNTSSERVICE_H
-#define UNITY_MOCK_ACCOUNTSSERVICE_H
+#pragma once
 
 #include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QVariant>
 
-class MockUsersModel;
+class UsersModel;
 
 class AccountsService: public QObject
 {
@@ -165,7 +164,5 @@
     QString m_realName;
     QStringList m_kbdMap;
     QString m_email;
-    MockUsersModel *m_usersModel;
+    UsersModel *m_usersModel;
 };
-
-#endif
 
=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
--- tests/mocks/AccountsService/CMakeLists.txt	2016-12-06 20:16:56 +0000
+++ tests/mocks/AccountsService/CMakeLists.txt	2017-01-25 16:04:08 +0000
@@ -1,14 +1,15 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/IntegratedLightDM
     ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
     )
 
 add_library(MockAccountsService-qml MODULE
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/PromptsModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
-    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp
     AccountsService.cpp
     plugin.cpp
     )
 
=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2016-12-06 20:16:56 +0000
+++ tests/mocks/CMakeLists.txt	2017-01-25 16:04:08 +0000
@@ -32,8 +32,9 @@
 add_subdirectory(Cursor)
 add_subdirectory(GSettings.1.0)
 add_subdirectory(indicator-service)
+add_subdirectory(liblightdm)
 add_subdirectory(libusermetrics)
-add_subdirectory(LightDM)
+add_subdirectory(LightDMController)
 add_subdirectory(Lights)
 add_subdirectory(MeeGo)
 add_subdirectory(Powerd)
 
=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
--- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2016-11-16 05:54:50 +0000
+++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2017-01-25 16:04:08 +0000
@@ -29,6 +29,7 @@
     , m_edgeDragWidth(2)
     , m_enableLauncher(true)
     , m_enableIndicatorMenu(true)
+    , m_appstoreUri("http://uappexplorer.com")
 {
 }
 
@@ -173,6 +174,11 @@
     }
 }
 
+QString GSettingsControllerQml::appstoreUri() const
+{
+    return m_appstoreUri;
+}
+
 GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
 }
 
@@ -376,6 +382,14 @@
     }
 }
 
+QVariant GSettingsQml::appstoreUri() const
+{
+    if (m_valid && m_schema->id() == "com.canonical.Unity8") {
+        return GSettingsControllerQml::instance()->appstoreUri();
+    }
+    return QVariant();
+}
+
 void GSettingsQml::setLifecycleExemptAppids(const QVariant &appIds)
 {
     if (m_valid && m_schema->id() == "com.canonical.qtmir") {
 
=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
--- tests/mocks/GSettings.1.0/fake_gsettings.h	2016-11-16 05:54:50 +0000
+++ tests/mocks/GSettings.1.0/fake_gsettings.h	2017-01-25 16:04:08 +0000
@@ -59,6 +59,7 @@
     Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)
     Q_PROPERTY(QVariant enableLauncher READ enableLauncher WRITE setEnableLauncher NOTIFY enableLauncherChanged)
     Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)
+    Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)
 
 public:
     GSettingsQml(QObject *parent = nullptr);
@@ -77,6 +78,7 @@
     QVariant edgeDragWidth() const;
     QVariant enableLauncher() const;
     QVariant enableIndicatorMenu() const;
+    QVariant appstoreUri() const;
 
     void setDisableHeight(const QVariant &val);
     void setPictureUri(const QVariant &str);
@@ -101,6 +103,7 @@
     void edgeDragWidthChanged();
     void enableLauncherChanged();
     void enableIndicatorMenuChanged();
+    void appstoreUriChanged();
 
 private:
     GSettingsSchemaQml* m_schema;
@@ -147,6 +150,8 @@
     bool enableIndicatorMenu() const;
     Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);
 
+    QString appstoreUri() const;
+
 Q_SIGNALS:
     void disableHeightChanged();
     void pictureUriChanged(const QString&);
@@ -158,6 +163,7 @@
     void edgeDragWidthChanged(uint edgeDragWidth);
     void enableLauncherChanged(bool enableLauncher);
     void enableIndicatorMenuChanged(bool enableIndicatorMenu);
+    void appstoreUriChanged(const QString &appstoreUri);
 
 private:
     GSettingsControllerQml();
@@ -172,6 +178,7 @@
     uint m_edgeDragWidth;
     bool m_enableLauncher;
     bool m_enableIndicatorMenu;
+    QString m_appstoreUri;
 
     static GSettingsControllerQml* s_controllerInstance;
     QList<GSettingsQml *> m_registeredGSettings;
 
=== removed directory 'tests/mocks/LightDM'
=== removed file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(IntegratedLightDM)
 
=== removed directory 'tests/mocks/LightDM/IntegratedLightDM'
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt'
--- tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	2016-07-14 13:04:10 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# This is a copy of the normal LightDM plugin, but instead of statically
-# linking in the lightdm bits, this one uses shared libraries so we can swap
-# out different sets of users for different tests.  When we finally switch to
-# actually using the system liblightdm in the normal plugin, this version can
-# be deleted.
-
-add_subdirectory(liblightdm)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/plugins/Utils
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM
-    ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
-    ${libunity8-private_SOURCE_DIR}
-)
-
-set(QMLPLUGIN_SRC
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/SessionsModel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
-    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
-    MockGreeter.cpp
-    MockSessionsModel.cpp
-    MockUsersModel.cpp
-    plugin.cpp
-    )
-
-add_library(MockLightDM-qml MODULE
-    ${QMLPLUGIN_SRC}
-    )
-
-# We want to link to liblightdm-qt5-3, but we don't want to depend on it being
-# installed on the system.  So we make sure we link to our full fake version
-# At run time, we can point to whichever version we happen to be using via
-# LD_LIBRARY_PATH.
-target_link_libraries(MockLightDM-qml
-    MockLightDM
-    MockUserMetrics
-    unity8-private
-    )
-
-qt5_use_modules(MockLightDM-qml DBus Gui Qml)
-
-add_unity8_mock(LightDM.IntegratedLightDM 0.1 LightDM/IntegratedLightDM
-    TARGETS MockLightDM-qml
-    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
-)
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	2016-06-09 21:45:09 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "MockGreeter.h"
-#include <GreeterPrivate.h>
-
-QString MockGreeter::mockMode() const
-{
-    Q_D(const Greeter);
-    return d->m_greeter->mockMode();
-}
-
-void MockGreeter::setMockMode(QString mockMode)
-{
-    Q_D(Greeter);
-
-    if (d->m_greeter->mockMode() != mockMode) {
-        d->m_greeter->setMockMode(mockMode);
-        Q_EMIT mockModeChanged(mockMode);
-    }
-}
-
-QString MockGreeter::selectUserHint() const
-{
-    Q_D(const Greeter);
-    return d->m_greeter->selectUserHint();
-}
-
-void MockGreeter::setSelectUserHint(const QString &selectUserHint)
-{
-    Q_D(Greeter);
-
-    if (d->m_greeter->selectUserHint() != selectUserHint) {
-        d->m_greeter->setSelectUserHint(selectUserHint);
-        Q_EMIT selectUserHintChanged();
-    }
-}
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	2016-06-09 21:45:09 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// The real, production, Greeter
-#include <Greeter.h>
-
-#ifndef MOCK_UNITY_GREETER_H
-#define MOCK_UNITY_GREETER_H
-
-class MockGreeter : public Greeter {
-    Q_OBJECT
-
-    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
-    Q_PROPERTY(QString selectUser READ selectUserHint WRITE setSelectUserHint NOTIFY selectUserHintChanged)
-
-public:
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
-
-    QString selectUserHint() const;
-    void setSelectUserHint(const QString &selectUserHint);
-
-Q_SIGNALS:
-    void mockModeChanged(QString mode);
-    void selectUserHintChanged();
-};
-
-#endif // MOCK_UNITY_GREETER_H
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2015 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 "MockSessionsModel.h"
-#include <QLightDM/SessionsModel>
-
-
-int MockSessionsModel::numSessions() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->numSessions();
-}
-
-int MockSessionsModel::numAvailableSessions() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->numAvailableSessions();
-}
-
-QString MockSessionsModel::testScenario() const
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    return qSessionsModel->testScenario();
-}
-
-void MockSessionsModel::setNumSessions(const int numSessions)
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    if (qSessionsModel->numSessions() != numSessions) {
-        qSessionsModel->setNumSessions(numSessions);
-        Q_EMIT numSessionsChanged();
-    }
-}
-
-void MockSessionsModel::setTestScenario(const QString testScenario)
-{
-    QLightDM::SessionsModel* qSessionsModel =
-        static_cast<QLightDM::SessionsModel*>(sourceModel());
-
-    if (qSessionsModel->testScenario() != testScenario) {
-        qSessionsModel->setTestScenario(testScenario);
-        Q_EMIT testScenarioChanged();
-    }
-}
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2015 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_UNITY_SESSIONSMODEL_H
-#define MOCK_UNITY_SESSIONSMODEL_H
-
-#include <SessionsModel.h>
-
-class MockSessionsModel : public SessionsModel
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int numAvailableSessions READ numAvailableSessions CONSTANT)
-    Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
-    Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario NOTIFY testScenarioChanged)
-
-public:
-    int numAvailableSessions() const;
-    int numSessions() const;
-    QString testScenario() const;
-    void setNumSessions(const int numSessions);
-    void setTestScenario(const QString testScenario);
-
-Q_SIGNALS:
-    void numSessionsChanged();
-    void testScenarioChanged();
-
-};
-
-#endif // MOCK_UNITY_SESSIONSMODEL_H
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	2016-08-04 14:05:54 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "MockUsersModel.h"
-#include <QLightDM/UsersModel>
-#include <QSortFilterProxyModel>
-
-MockUsersModel::MockUsersModel(QObject* parent)
-    : UsersModel(parent)
-{
-}
-
-QString MockUsersModel::mockMode() const
-{
-    QLightDM::UsersModel* qUsersModel =
-        static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());
-
-    return qUsersModel->mockMode();
-}
-
-void MockUsersModel::setMockMode(QString mockMode)
-{
-    QLightDM::UsersModel* qUsersModel =
-        static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());
-
-    if (qUsersModel->mockMode() != mockMode) {
-        qUsersModel->setMockMode(mockMode);
-        Q_EMIT mockModeChanged(mockMode);
-    }
-}
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	2016-08-04 14:05:54 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef MOCK_UNITY_USERSMODEL_H
-#define MOCK_UNITY_USERSMODEL_H
-
-#include <UsersModel.h>
-
-class MockUsersModel : public UsersModel
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
-
-public:
-    explicit MockUsersModel(QObject* parent=0);
-
-    QString mockMode() const;
-    void setMockMode(QString mockMode);
-
-Q_SIGNALS:
-    void mockModeChanged(QString mode);
-};
-
-#endif // MOCK_UNITY_USERSMODEL_H
 
=== removed directory 'tests/mocks/LightDM/IntegratedLightDM/QLightDM'
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "../liblightdm/Greeter.h"
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2015-11-18 03:52:01 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2015 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 "../liblightdm/SessionsModel.h"
 
=== removed file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModel'
--- tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModel	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *