Unity 8

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

greeter-focus
Merge into trunk

Proposed by Michael Terry on 2016-06-22

Status:

Superseded

Proposed branch:

lp:~mterry/unity8/greeter-focus

Merge into:

lp:unity8

Prerequisite:

lp:~josharenson/unity8/slim_greeter_real_lightdm

Diff against target:

2260 lines (+1309/-134)

43 files modified

plugins/LightDM/CMakeLists.txt (+1/-2)
plugins/LightDM/FullLightDM/CMakeLists.txt (+4/-1)
plugins/LightDM/Greeter.cpp (+7/-2)
plugins/LightDM/Greeter.h (+3/-2)
plugins/LightDM/IntegratedLightDM/CMakeLists.txt (+2/-3)
plugins/LightDM/IntegratedLightDM/QLightDM/Greeter (+17/-0)
plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel (+17/-0)
plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel (+17/-0)
plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt (+2/-0)
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp (+88/-0)
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h (+72/-0)
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp (+36/-0)
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h (+54/-0)
plugins/LightDM/SessionsModel.cpp (+122/-0)
plugins/LightDM/SessionsModel.h (+68/-0)
plugins/LightDM/plugin.cpp (+17/-7)
qml/Greeter/Greeter.qml (+28/-24)
qml/Greeter/GreeterPrompt.qml (+64/-12)
qml/Greeter/LoginList.qml (+27/-16)
qml/Greeter/NarrowView.qml (+2/-1)
qml/Greeter/WideView.qml (+4/-3)
qml/Shell.qml (+5/-3)
tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt (+2/-0)
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp (+37/-0)
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h (+34/-0)
tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel (+17/-0)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt (+2/-0)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp (+1/-1)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp (+99/-0)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h (+72/-0)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp (+73/-0)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h (+59/-0)
tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+22/-22)
tests/mocks/LightDM/IntegratedLightDM/plugin.cpp (+11/-0)
tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt (+23/-0)
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp (+96/-0)
tests/qmltests/Greeter/TestView.qml (+0/-1)
tests/qmltests/Greeter/tst_Greeter.qml (+2/-12)
tests/qmltests/Greeter/tst_WideView.qml (+90/-12)
tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1)
tests/qmltests/tst_OrientedShell.qml (+2/-2)
tests/qmltests/tst_Shell.qml (+3/-3)
tests/qmltests/tst_ShellWithPin.qml (+6/-4)

To merge this branch:

bzr merge lp:~mterry/unity8/greeter-focus

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-22
Unity Team		2016-06-22	Pending
Review via email: mp+298113@code.launchpad.net

This proposal has been superseded by a proposal from 2016-06-30.

Commit Message

Fix tablet greeter focus to be always-on, no longer hiding the OSK or forcing a mouse click to type a password.

I've also squeezed some other small fixes in:

- Support Up and Down keys in user list.
- Don't accept non-digit characters when prompting for passcode (we ask OSK to show only digits, but due to bug 1586435, it shows other characters too; plus if the user has an external keyboard, they can type anything anyway).
- When prompting for a passcode in wide-view (tablet/desktop), stop at 4 digits just like we do in narrow-view.
- Don't show "Retry" during brief period before a prompt comes in from PAM.
- Don't let user drag user list if there's only one entry.

Now as for the focus changes...

One of the big reasons we lost keyboard focus before was because we set the shell to disabled whenever the greeter was "between PAM events" -- mostly so that the user can't swipe away greeter before we get our first prompt or are otherwise unsure about exactly what authentication is needed.

But disabled qml items can't be focused. So I've rejiggered things a bit. Instead of disabling the whole shell, I just disable the launcher, the indicators, and make the greeter non-swipeable.

I also do some tricks with the prompt so that it looks disabled (while we check with PAM about the password) but isn't actually. I don't want to make it look to the user that pressing backspace while they wait for PAM does anything, so after the user presses Enter, I present a fake label on top of the prompt that looks like a disabled prompt, while simultaneously hiding the prompt contents.

Description of the Change

You could mostly just test this on your desktop. Changes are all to the wide-view side of things.

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

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

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

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

Michael Terry (mterry) wrote on 2016-06-22:

I'm going to work on some qmltests now, but this branch can be reviewed and tested in meantime.

Michael Terry (mterry) wrote on 2016-06-22:

OK, tests added.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-22:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-22:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-22:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-focus updated on 2016-07-08

1994. By Michael Terry on 2016-06-27: Fix focus on greeter and various other bugs
1995. By Michael Terry on 2016-06-27: Merge from slim_greeter_real_lightdm
1996. By Michael Terry on 2016-06-27: Whoops, reset po files that got changed somehow
1997. By Michael Terry on 2016-06-28: Fix minor issue when auto-responding with a passcode
1998. By Michael Terry on 2016-06-29: Merge parent
1999. By Michael Terry on 2016-06-30: Merge sessions-model
2000. By Michael Terry on 2016-07-06: Be smoother about focus in GreeterPrompt
2001. By Michael Terry on 2016-07-06: remove unneeded check, fixes test
2002. By Michael Terry on 2016-07-06: Merge in greeter-hide-indicators
2003. By Michael Terry on 2016-07-07: Update copyrights
2004. By Michael Terry on 2016-07-07: Give wideview test focus to start
2005. By Michael Terry on 2016-07-08: Merge focus refactor from dandrader
2006. By Michael Terry on 2016-07-08: Merge tryWideView focus refactor from dandrader
2007. By Michael Terry on 2016-07-08: Make it clear in GreeterPrompt that fakeLabel is for OSK focus
2008. By Michael Terry on 2016-07-08: Fix a test

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/LightDM/CMakeLists.txt'
 --- plugins/LightDM/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -7,9 +7,7 @@
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/Utils
--    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
      ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM
--    ${LIBLIGHTDM_INCLUDE_DIRS}
      ${libunity8-private_SOURCE_DIR}
      ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
+ )
@@ -20,6 +18,7 @@
      DBusGreeterList.cpp
      Greeter.cpp
      plugin.cpp
++    SessionsModel.cpp
      UsersModel.cpp
+     )
 === modified file 'plugins/LightDM/FullLightDM/CMakeLists.txt'
 --- plugins/LightDM/FullLightDM/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/FullLightDM/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -4,7 +4,10 @@
  add_definitions(-DFULL_LIGHTDM)
--include_directories(../)
++include_directories(
++    ../
++    ${LIBLIGHTDM_INCLUDE_DIRS}
++    )
  foreach(source_file ${QMLPLUGIN_SRC})
      list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
 === modified file 'plugins/LightDM/Greeter.cpp'
 --- plugins/LightDM/Greeter.cpp	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/Greeter.cpp	2016-06-30 19:05:07 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013, 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
@@ -13,7 +13,6 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Author: Michael Terry <michael.terry@canonical.com>
   */
  #include "Greeter.h"
@@ -72,6 +71,12 @@
      return d->m_greeter->authenticationUser();
+ }
++QString Greeter::defaultSessionHint() const
++{
++    Q_D(const Greeter);
++    return d->m_greeter->defaultSessionHint();
++}
++
  bool Greeter::promptless() const
+ {
      Q_D(const Greeter);
 === modified file 'plugins/LightDM/Greeter.h'
 --- plugins/LightDM/Greeter.h	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/Greeter.h	2016-06-30 19:05:07 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2012,2013 Canonical, Ltd.
++ * Copyright (C) 2012,2013,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
@@ -13,7 +13,6 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
-- * Authors: Michael Terry <michael.terry@canonical.com>
   */
  /* This class is a really tiny filter around QLightDM::Greeter.  There are some
@@ -37,6 +36,7 @@
      Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
      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)
@@ -46,6 +46,7 @@
      bool isActive() const;
      bool isAuthenticated() const;
      QString authenticationUser() const;
++    QString defaultSessionHint() const;
      bool promptless() const;
      QString selectUser() const;
 === modified file 'plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
 --- plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -7,9 +7,8 @@
  endforeach()
  include_directories(
--    ${QMLPLUGIN_INCLUDES}
--    ${libunity8-private_SOURCE_DIR}
--)
++    . #QLightDM
++    )
  foreach(source_file ${QMLPLUGIN_SRC})
      list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})
 === added directory 'plugins/LightDM/IntegratedLightDM/QLightDM'
 === added file 'plugins/LightDM/IntegratedLightDM/QLightDM/Greeter'
 --- plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/QLightDM/Greeter	2016-06-30 19:05:07 +0000
@@ -0,0 +1,17 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "../liblightdm/Greeter.h"
 === added file 'plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
 --- plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2016-06-30 19:05:07 +0000
@@ -0,0 +1,17 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "../liblightdm/SessionsModel.h"
 === added file 'plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel'
 --- plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel	2016-06-30 19:05:07 +0000
@@ -0,0 +1,17 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "../liblightdm/UsersModel.h"
 === modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt'
 --- plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -2,8 +2,10 @@
  set(LibLightDM_SOURCES
      Greeter.cpp
++    SessionsModel.cpp
      UsersModel.cpp
      GreeterPrivate.cpp
++    SessionsModelPrivate.cpp
      UsersModelPrivate.cpp
      ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
 === added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
 --- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,88 @@
++/*
++ * 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/>.
++ *
++ */
++
++
++/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
++ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
++ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
++
++// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
++// To use the same method of setting role name that it does, we
++// set our compatibility to Qt4 here too.
++#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
++
++#include "SessionsModel.h"
++#include "SessionsModelPrivate.h"
++#include <QtCore/QDir>
++#include <QtCore/QString>
++
++namespace QLightDM
++{
++
++SessionsModel::SessionsModel(QObject* parent) :
++    QAbstractListModel(parent),
++    d_ptr(new SessionsModelPrivate(this))
++{
++    Q_D(SessionsModel);
++    m_roleNames = QAbstractListModel::roleNames();
++    m_roleNames[KeyRole] = "key";
++    m_roleNames[TypeRole] = "type";
++}
++
++SessionsModel::~SessionsModel()
++{
++    delete d_ptr;
++}
++
++QVariant SessionsModel::data(const QModelIndex& index, int role) const
++{
++    Q_D(const SessionsModel);
++
++    if(!index.isValid()) {
++        return QVariant();
++    }
++
++    int row = index.row();
++
++    switch (role) {
++        case QLightDM::SessionsModel::KeyRole:
++            return d->sessionItems[row].key;
++        case Qt::DisplayRole:
++            return d->sessionItems[row].name;
++        default:
++            return QVariant();
++    }
++}
++
++QHash<int, QByteArray> SessionsModel::roleNames() const
++{
++    return m_roleNames;
++}
++
++int SessionsModel::rowCount(const QModelIndex& parent) const
++{
++    Q_D(const SessionsModel);
++
++    if (parent.isValid()) {
++        return 0;
++    } else { // parent is root
++        return d->sessionItems.size();
++    }
++}
++
++} // namespace QLightDM
 === added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
 --- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-06-30 19:05:07 +0000
@@ -0,0 +1,72 @@
++/*
++ * 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 UNITY_INTEGRATED_SESSIONSMODEL_H
++#define UNITY_INTEGRATED_SESSIONSMODEL_H
++
++#include <QtCore/QAbstractListModel>
++#include <QtCore/QString>
++
++/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
++ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
++ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm
++ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
++
++// This is taken from liblightdm and modified to confirm to our syle conventions
++namespace QLightDM
++{
++class SessionsModelPrivate;
++
++class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
++    {
++        Q_OBJECT
++
++        Q_ENUMS(SessionModelRoles SessionType)
++
++    public:
++
++        enum SessionModelRoles {
++            //name is exposed as Qt::DisplayRole
++            //comment is exposed as Qt::TooltipRole
++            KeyRole = Qt::UserRole,
++            IdRole = KeyRole, /** Deprecated */
++            TypeRole
++        };
++
++        enum SessionType {
++            LocalSessions,
++            RemoteSessions
++        };
++
++        explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
++        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
++        virtual ~SessionsModel();
++
++        QHash<int, QByteArray> roleNames() const override;
++        int rowCount(const QModelIndex& parent) const override;
++        QVariant data(const QModelIndex& index, int role) const override;
++
++    protected:
++        SessionsModelPrivate* const d_ptr;
++
++    private:
++        QHash<int, QByteArray> m_roleNames;
++        Q_DECLARE_PRIVATE(SessionsModel)
++    };
++}
++
++#endif // UNITY_INTEGRATED_SESSIONSMODEL_H
 === added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
 --- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,36 @@
++/*
++ * 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 "SessionsModelPrivate.h"
++
++#include <QDir>
++#include <QSettings>
++#include <QStringList>
++
++namespace QLightDM
++{
++
++SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
++  : q_ptr(parent)
++{
++    // Since this model is never visible, as there is only 1 session,
++    // just use the session name as the key
++    QString sessionName = qgetenv("XDG_SESSION_DESKTOP");
++    sessionItems.append({sessionName, "", sessionName, ""});
++}
++
++} // namespace QLightDM
 === added file 'plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
 --- plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-06-30 19:05:07 +0000
@@ -0,0 +1,54 @@
++/*
++ * 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 UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
++#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
++
++#include <QtCore/QList>
++#include <QtCore/QString>
++
++namespace QLightDM
++{
++class SessionsModel;
++
++class SessionItem
++{
++public:
++    QString key;
++    QString type; // unused
++    QString name;
++    QString comment; // unused
++};
++
++class SessionsModelPrivate
++{
++public:
++    explicit SessionsModelPrivate(SessionsModel* parent=0);
++    virtual ~SessionsModelPrivate() = default;
++
++    QList<SessionItem> sessionItems;
++
++protected:
++    SessionsModel* const q_ptr;
++
++private:
++    Q_DECLARE_PUBLIC(SessionsModel)
++};
++
++} // namespace QLightDM
++
++#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H
 === added file 'plugins/LightDM/SessionsModel.cpp'
 --- plugins/LightDM/SessionsModel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/SessionsModel.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,122 @@
++/*
++ * 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 "SessionsModel.h"
++#include <QtCore/QFile>
++#include <QtCore/QSortFilterProxyModel>
++
++QHash<int, QByteArray> SessionsModel::roleNames() const
++{
++    return m_roleNames;
++}
++
++int SessionsModel::rowCount(const QModelIndex& parent) const
++{
++    return m_model->rowCount(parent);
++}
++
++QList<QUrl> SessionsModel::iconSearchDirectories() const
++{
++    return m_iconSearchDirectories;
++}
++
++void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)
++{
++    // QML gives us a url with file:// prepended which breaks QFile::exists()
++    // so convert the url to a local file
++    QList<QUrl> localList = {};
++    Q_FOREACH(const QUrl& searchDirectory, searchDirectories)
++    {
++        localList.append(searchDirectory.toLocalFile());
++    }
++    m_iconSearchDirectories = localList;
++    Q_EMIT iconSearchDirectoriesChanged();
++}
++
++QUrl SessionsModel::iconUrl(const QString sessionName) const
++{
++    Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
++    {
++        // This is an established icon naming convention
++        QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
++            "/custom_" + sessionName  + "_badge.png";
++        QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
++            "/" + sessionName  + "_badge.png";
++
++        QFile customIconFile(customIconUrl);
++        QFile iconFile(iconUrl);
++        if (customIconFile.exists()) {
++            return QUrl(customIconUrl);
++        } else if (iconFile.exists()) {
++            return QUrl(iconUrl);
++        } else{
++            // Search the legacy way
++            QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";
++            if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {
++                path += "ubuntu_badge.png";
++            } else if(
++                        sessionName == "gnome-classic" ||
++                        sessionName == "gnome-flashback-compiz" ||
++                        sessionName == "gnome-flashback-metacity" ||
++                        sessionName == "gnome-shell" ||
++                        sessionName == "gnome-wayland" ||
++                        sessionName == "gnome"
++                    ){
++                path += "gnome_badge.png";
++            } else if (sessionName == "plasma") {
++                path += "kde_badge.png";
++            } else if (sessionName == "xterm") {
++                path += "recovery_console_badge.png";
++            } else if (sessionName == "remote-login") {
++                path += "remote_login_help.png";
++            }
++
++            if (QFile(path).exists()) {
++                return path;
++            }
++        }
++    }
++
++    // FIXME make this smarter
++    return QUrl("./graphics/session_icons/unknown_badge.png");
++}
++
++QVariant SessionsModel::data(const QModelIndex& index, int role) const
++{
++    switch (role) {
++        case SessionsModel::IconRole:
++            return iconUrl(m_model->data(index, Qt::DisplayRole).toString());
++        default:
++            return m_model->data(index, role);
++    }
++}
++
++SessionsModel::SessionsModel(QObject* parent)
++  : UnitySortFilterProxyModelQML(parent)
++{
++    // Add a custom IconRole that isn't in either of the lightdm implementations
++    m_model = new QLightDM::SessionsModel(this);
++    m_roleNames = m_model->roleNames();
++    m_roleNames[IconRole] = "icon_url";
++
++    setModel(m_model);
++    setSourceModel(m_model);
++    setSortCaseSensitivity(Qt::CaseInsensitive);
++    setSortLocaleAware(true);
++    setSortRole(Qt::DisplayRole);
++    sort(0);
++}
 === added file 'plugins/LightDM/SessionsModel.h'
 --- plugins/LightDM/SessionsModel.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/SessionsModel.h	2016-06-30 19:05:07 +0000
@@ -0,0 +1,68 @@
++/*
++ * 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 UNITY_SESSIONSMODEL_H
++#define UNITY_SESSIONSMODEL_H
++
++#include <unitysortfilterproxymodelqml.h>
++#include <QLightDM/SessionsModel>
++#include <QtCore/QHash>
++#include <QtCore/QObject>
++#include <QtCore/QUrl>
++
++class SessionsModel : public UnitySortFilterProxyModelQML
++{
++    Q_OBJECT
++
++    Q_ENUMS(SessionModelRoles)
++
++    Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories
++            WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)
++Q_SIGNALS:
++    void iconSearchDirectoriesChanged();
++
++public:
++    enum SessionModelRoles {
++        /* This is tricky / ugly. Since we are ultimately chaining 3 enums together,
++         * the _first_ value of this enum MUST be the _last_ value of
++         * QLightDM::SessionsModel::SessionModelRoles and consquently, this must
++         * also match the last value in the corresponding enum of the integrated lib
++         */
++        TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,
++        IconRole
++    };
++
++    explicit SessionsModel(QObject* parent=nullptr);
++
++    QHash<int, QByteArray>  roleNames() const override;
++    int rowCount(const QModelIndex& parent) const override;
++    QVariant data(const QModelIndex& index, int role) const override;
++    QList<QUrl> iconSearchDirectories() const;
++    Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;
++
++    void setIconSearchDirectories(const QList<QUrl> searchDirectories);
++private:
++    QLightDM::SessionsModel* m_model;
++    QHash<int, QByteArray> m_roleNames;
++    QList<QUrl> m_iconSearchDirectories{
++        QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),
++        QUrl("/usr/local/share/unity-greeter"),
++        QUrl("/usr/share/unity-greeter/")};
++
++};
++
++#endif // UNITY_SESSIONSMODEL_H
 === modified file 'plugins/LightDM/plugin.cpp'
 --- plugins/LightDM/plugin.cpp	2016-06-30 19:05:01 +0000
 +++ plugins/LightDM/plugin.cpp	2016-06-30 19:05:07 +0000
@@ -19,9 +19,11 @@
  #include "DBusGreeter.h"
  #include "DBusGreeterList.h"
  #include "Greeter.h"
++#include "SessionsModel.h"
  #include "UsersModel.h"
  #include <libusermetricsoutput/ColorTheme.h>
  #include <libusermetricsoutput/UserMetrics.h>
++#include <QLightDM/SessionsModel>
  #include <QLightDM/UsersModel>
  #include <QAbstractItemModel>
@@ -40,6 +42,13 @@
      return greeter;
+ }
++static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new SessionsModel();
++}
++
  static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
      Q_UNUSED(engine)
@@ -61,21 +70,22 @@
  #if defined INTEGRATED_LIGHTDM
      Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));
++    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
  #elif defined FULL_LIGHTDM
      Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));
--#endif
--    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
--    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
--
--#if defined INTEGRATED_LIGHTDM
--    qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
--#elif defined FULL_LIGHTDM
      qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);
  #else
      #error No library defined in LightDM plugin
  #endif
++    qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
++    qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
++
++    qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
++    qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));
++
      qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
      qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));
++
      qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
+ }
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2016-06-30 19:05:01 +0000
 +++ qml/Greeter/Greeter.qml	2016-06-30 19:05:07 +0000
@@ -163,35 +163,41 @@
              return -1;
+         }
--        function selectUser(uid, reset) {
--            if (uid < 0)
++        function selectUser(index, reset) {
++            if (index < 0 || index >= LightDMService.users.count)
                  return;
              d.waiting = true;
              if (reset) {
                  loader.item.reset();
+             }
--            currentIndex = uid;
--            var user = LightDMService.users.data(uid, LightDMService.userRoles.NameRole);
++            currentIndex = index;
++            var user = LightDMService.users.data(index, LightDMService.userRoles.NameRole);
              AccountsService.user = user;
              LauncherModel.setUser(user);
              LightDMService.greeter.authenticate(user); // always resets auth state
+         }
++        function hideView() {
++            if (loader.item) {
++                loader.item.enabled = false; // drop OSK and prevent interaction
++                loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
++                loader.item.hide();
++            }
++        }
++
          function login() {
--            enabled = false;
++            d.waiting = true;
              if (LightDMService.greeter.startSessionSync()) {
                  sessionStarted();
--                if (loader.item) {
--                    loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
--                }
++                hideView();
              } else if (loader.item) {
                  loader.item.notifyAuthenticationFailed();
+             }
--            enabled = true;
++            d.waiting = false;
+         }
          function startUnlock(toTheRight) {
--            if (loader.item) {
++            if (loader.item && !d.waiting) {
                  return loader.item.tryToUnlock(toTheRight);
              } else {
                  return false;
@@ -199,10 +205,8 @@
+         }
          function checkForcedUnlock(hideNow) {
--            if (forcedUnlock && shown && loader.item) {
--                // pretend we were just authenticated
--                loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
--                loader.item.hide();
++            if (forcedUnlock && shown) {
++                hideView();
                  if (hideNow) {
                      root.hideNow(); // skip hide animation
+                 }
@@ -323,7 +327,7 @@
          onLoaded: {
              root.lockedApp = "";
--            root.forceActiveFocus();
++            item.forceActiveFocus();
              d.selectUser(d.currentIndex, true);
              LightDMService.infographic.readyForDataChange();
+         }
@@ -333,13 +337,11 @@
              onSelected: {
                  d.selectUser(index, true);
+             }
--            onPromptlessLogin: d.login();
              onResponded: {
                  if (root.locked) {
                      LightDMService.greeter.respond(response);
                  } else {
                      d.login();
--                    loader.item.hide();
+                 }
+             }
              onTease: root.tease()
@@ -389,6 +391,12 @@
          Binding {
              target: loader.item
++            property: "waiting"
++            value: d.waiting
++        }
++
++        Binding {
++            target: loader.item
              property: "alphanumeric"
              value: d.alphanumeric
+         }
@@ -417,10 +425,7 @@
          onShowGreeter: root.forceShow()
--        onHideGreeter: {
--            d.login();
--            loader.item.hide();
--        }
++        onHideGreeter: d.login()
          onShowMessage: {
              // inefficient, but we only rarely deal with messages
@@ -438,11 +443,11 @@
+         }
          onShowPrompt: {
--            d.waiting = false;
--
              if (loader.item) {
                  loader.item.showPrompt(text, isSecret, isDefaultPrompt);
+             }
++
++            d.waiting = false;
+         }
          onAuthenticationComplete: {
@@ -451,7 +456,6 @@
              if (LightDMService.greeter.authenticated) {
                  if (!LightDMService.greeter.promptless) {
                      d.login();
--                    loader.item.hide();
+                 }
              } else {
                  if (!LightDMService.greeter.promptless) {
 === modified file 'qml/Greeter/GreeterPrompt.qml'
 --- qml/Greeter/GreeterPrompt.qml	2016-06-06 18:21:22 +0000
 +++ qml/Greeter/GreeterPrompt.qml	2016-06-30 19:05:07 +0000
@@ -16,6 +16,7 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
++import "../Components"
  FocusScope {
      id: root
@@ -33,6 +34,7 @@
      function reset() {
          passwordInput.text = "";
++        fakeLabel.text = "";
          d.enabled = true;
+     }
@@ -62,10 +64,14 @@
          objectName: "promptButton"
          anchors.fill: parent
          visible: !root.isPrompt
--        enabled: d.enabled
          focus: visible
--        onClicked: root.clicked()
++        onClicked: {
++            if (d.enabled) {
++                d.enabled = false;
++                root.clicked();
++            }
++        }
          Label {
              anchors.centerIn: parent
@@ -79,10 +85,22 @@
          objectName: "promptField"
          anchors.fill: parent
          visible: root.isPrompt
--        enabled: d.enabled
--        focus: visible
--
--        inputMethodHints: root.isAlphanumeric ? Qt.ImhNone : Qt.ImhDigitsOnly
++        opacity: fakeLabel.visible ? 0 : 1
++
++        // Oddly, a simple "focus: visible" does not stick -- the binding
++        // gets lost when switching between buttons and prompts.  But this
++        // explicit binding does work.
++        Binding on focus {
++            value: passwordInput.visible
++        }
++
++        validator: RegExpValidator {
++            regExp: root.isAlphanumeric ? /^.*$/ : /^\d{4}$/
++        }
++
++        inputMethodHints: Qt.ImhSensitiveData | Qt.ImhNoPredictiveText |
++                          Qt.ImhMultiLine | // so OSK doesn't close on Enter
++                          (root.isAlphanumeric ? Qt.ImhNone : Qt.ImhDigitsOnly)
          echoMode: root.isSecret ? TextInput.Password : TextInput.Normal
          hasClearButton: false
@@ -107,17 +125,35 @@
                  width: units.gu(3)
                  color: d.textColor
                  visible: root.isSecret && false // TODO: detect when caps lock is on
++                readonly property real visibleWidth: visible ? width + passwordInput.frameSpacing : 0
+             }
+         ]
++        onDisplayTextChanged: {
++            // We use onDisplayTextChanged instead of onTextChanged because
++            // displayText changes after text and if we did this before it
++            // updated, we would use the wrong displayText for fakeLabel.
++            if (!isAlphanumeric && text.length >= 4) {
++                // hard limit of 4 for passcodes right now
++                respond();
++            }
++        }
++
          onAccepted: {
--            if (!enabled)
--                return;
++            if (d.enabled)
++                respond();
++        }
++
++        function respond() {
              d.enabled = false;
++            fakeLabel.text = displayText;
              root.responded(text);
+         }
--        Keys.onEscapePressed: root.canceled()
++        Keys.onEscapePressed: {
++            root.canceled();
++            event.accepted = true;
++        }
          // We use our own custom placeholder label instead of the standard
          // TextField one because the standard one hardcodes baseText as the
@@ -129,9 +165,7 @@
                  right: parent.right
                  verticalCenter: parent.verticalCenter
                  leftMargin: units.gu(1.5)
--                rightMargin: anchors.leftMargin +
--                             (capsIcon.visible ? capsIcon.width + passwordInput.frameSpacing
--                                               : 0)
++                rightMargin: anchors.leftMargin + capsIcon.visibleWidth
+             }
              text: root.text
              visible: passwordInput.text == "" && !passwordInput.inputMethodComposing
@@ -139,4 +173,22 @@
              elide: Text.ElideRight
+         }
+     }
++
++    // Have a fake label that covers the text field after the user presses
++    // enter.  What we *really* want is a disabled mode that doesn't lose
++    // focus.  Because our goal here is simply to keep the OSK up while
++    // we wait for PAM to get back to us, and while waiting, we don't want
++    // the user to be able to edit the field (simply because it would look
++    // weird if we allowed that).  But until we have such a disabled mode,
++    // we'll fake it by covering the real text field with a label.
++    FadingLabel {
++        id: fakeLabel
++        anchors.verticalCenter: parent.verticalCenter
++        anchors.left: parent.left
++        anchors.right: parent.right
++        anchors.leftMargin: passwordInput.frameSpacing * 2
++        anchors.rightMargin: passwordInput.frameSpacing * 2 + capsIcon.visibleWidth
++        color: d.drawColor
++        visible: root.isPrompt && !d.enabled
++    }
+ }
 === modified file 'qml/Greeter/LoginList.qml'
 --- qml/Greeter/LoginList.qml	2016-06-30 19:05:01 +0000
 +++ qml/Greeter/LoginList.qml	2016-06-30 19:05:07 +0000
@@ -21,11 +21,13 @@
  StyledItem {
      id: root
++    focus: true
      property alias model: userList.model
      property bool alphanumeric: true
      property int currentIndex
      property bool locked
++    property bool waiting
      readonly property int numAboveBelow: 4
      readonly property int cellHeight: units.gu(5)
@@ -36,7 +38,6 @@
      signal selected(int index)
      signal responded(string response)
--    signal promptlessLogin()
      function tryToUnlock() {
          if (wasPrompted) {
@@ -45,7 +46,6 @@
              if (root.locked) {
                  root.selected(currentIndex);
              } else {
--                promptlessLogin();
                  root.responded("");
+             }
+         }
@@ -60,20 +60,18 @@
+     }
      function showPrompt(text, isSecret, isDefaultPrompt) {
--        d.promptText = text;
--        passwordInput.reset();
++        passwordInput.text = isDefaultPrompt ? alphanumeric ? i18n.tr("Passphrase")
++                                                            : i18n.tr("Passcode")
++                                             : text;
++        passwordInput.isPrompt = true;
          passwordInput.isSecret = isSecret;
--        if (wasPrompted) // stay in text field if second prompt
--            passwordInput.focus = true;
++        passwordInput.reset();
          wasPrompted = true;
+     }
      function showError() {
          wrongPasswordAnimation.start();
          root.resetAuthentication();
--        if (wasPrompted) {
--            passwordInput.focus = true;
--        }
+     }
      function reset() {
@@ -83,15 +81,33 @@
      QtObject {
          id: d
--        property string promptText
++        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()
++
      theme: ThemeSettings {
          name: "Ubuntu.Components.Themes.Ambiance"
+     }
++    Keys.onUpPressed: {
++        selected(currentIndex - 1);
++        event.accepted = true;
++    }
++    Keys.onDownPressed: {
++        selected(currentIndex + 1);
++        event.accepted = true;
++    }
      Keys.onEscapePressed: {
          selected(currentIndex);
++        event.accepted = true;
+     }
      onCurrentIndexChanged: {
@@ -137,6 +153,7 @@
          highlightRangeMode: ListView.StrictlyEnforceRange
          highlightMoveDuration: root.moveDuration
          flickDeceleration: 10000
++        interactive: count > 1
          readonly property bool movingInternally: moveTimer.running || userList.moving
          onMovingInternallyChanged: {
@@ -254,13 +271,8 @@
          width: highlightItem.width - anchors.margins * 2
          opacity: userList.movingInternally ? 0 : 1
--        isPrompt: root.wasPrompted
          isAlphanumeric: root.alphanumeric
--        text: root.wasPrompted ? d.promptText
--                               : (root.locked ? i18n.tr("Retry")
--                                              : i18n.tr("Log In"))
--
          onClicked: root.tryToUnlock()
          onResponded: root.responded(text)
          onCanceled: root.selected(currentIndex)
@@ -280,7 +292,6 @@
              return;
+         }
          infoLabel.text = "";
--        d.promptText = "";
          passwordInput.reset();
          root.wasPrompted = false;
+     }
 === modified file 'qml/Greeter/NarrowView.qml'
 --- qml/Greeter/NarrowView.qml	2016-06-20 20:23:28 +0000
 +++ qml/Greeter/NarrowView.qml	2016-06-30 19:05:07 +0000
@@ -31,6 +31,7 @@
      property bool alphanumeric
      property var userModel // unused
      property alias infographicModel: coverPage.infographicModel
++    property bool waiting
      readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
      readonly property bool required: coverPage.required || lockscreen.required
      readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
@@ -71,7 +72,6 @@
          if (!alphanumeric && showFakePassword) {
              lockscreen.showText("...."); // actual text doesn't matter, we show bullets
+         }
--        lockscreen.hide();
+     }
      function notifyAuthenticationFailed() {
@@ -172,6 +172,7 @@
          height: parent.height
          width: parent.width
          background: root.background
++        draggable: !root.waiting
          onTease: root.tease()
          onClicked: hide()
 === modified file 'qml/Greeter/WideView.qml'
 --- qml/Greeter/WideView.qml	2016-06-30 19:05:01 +0000
 +++ qml/Greeter/WideView.qml	2016-06-30 19:05:07 +0000
@@ -19,6 +19,7 @@
  FocusScope {
      id: root
++    focus: true
      property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
      property alias launcherOffset: coverPage.launcherOffset
@@ -30,6 +31,7 @@
      property alias alphanumeric: loginList.alphanumeric
      property alias userModel: loginList.model
      property alias infographicModel: coverPage.infographicModel
++    property bool waiting
      readonly property bool fullyShown: coverPage.showProgress === 1
      readonly property bool required: coverPage.required
      readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
@@ -37,7 +39,6 @@
      // so that it can be replaced in tests with a mock object
      property var inputMethod: Qt.inputMethod
--    signal promptlessLogin()
      signal selected(int index)
      signal responded(string response)
      signal tease()
@@ -102,7 +103,7 @@
          objectName: "coverPage"
          height: parent.height
          width: parent.width
--        draggable: !root.locked
++        draggable: !root.locked && !root.waiting
          infographics {
              height: 0.75 * parent.height
@@ -132,8 +133,8 @@
              Behavior on height { UbuntuNumberAnimation {} }
              locked: root.locked
++            waiting: root.waiting
--            onPromptlessLogin: root.promptlessLogin()
              onSelected: root.selected(index)
              onResponded: root.responded(response)
+         }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-06-30 19:05:01 +0000
 +++ qml/Shell.qml	2016-06-30 19:05:07 +0000
@@ -137,9 +137,9 @@
      // For autopilot consumption
      readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
--    // Disable everything while greeter is waiting, so that the user can't swipe
--    // the greeter or launcher until we know whether the session is locked.
--    enabled: greeter && !greeter.waiting
++    // Note when greeter is waiting on PAM, so that we can disable edges until
++    // we know which user data to show and whether the session is locked.
++    readonly property bool waitingOnGreeter: greeter && greeter.waiting
      property real edgeSize: units.gu(settings.edgeDragWidth)
@@ -528,6 +528,7 @@
                  available: tutorial.panelEnabled
                          && ((!greeter || !greeter.locked) || AccountsService.enableIndicatorsWhileLocked)
                          && (!greeter || !greeter.hasLockedApp)
++                        && !shell.waitingOnGreeter
                  width: parent.width > units.gu(60) ? units.gu(40) : parent.width
                  minimizedPanelHeight: units.gu(3)
@@ -578,6 +579,7 @@
              available: tutorial.launcherEnabled
                      && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
                      && !greeter.hasLockedApp
++                    && !shell.waitingOnGreeter
              inverted: shell.usageScenario !== "desktop"
              superPressed: physicalKeysMapper.superPressed
              superTabPressed: physicalKeysMapper.superTabPressed
 === modified file 'tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt'
 --- tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -19,9 +19,11 @@
      ${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
+     )
 === added file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp'
 --- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,37 @@
++/*
++ * 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>
++
++QString MockSessionsModel::testScenario() const
++{
++    QLightDM::SessionsModel* qSessionsModel =
++        static_cast<QLightDM::SessionsModel*>(sourceModel());
++
++    return qSessionsModel->testScenario();
++}
++
++void MockSessionsModel::setTestScenario(const QString testScenario)
++{
++    QLightDM::SessionsModel* qSessionsModel =
++        static_cast<QLightDM::SessionsModel*>(sourceModel());
++
++    if (qSessionsModel->testScenario() != testScenario) {
++        qSessionsModel->setTestScenario(testScenario);
++    }
++}
 === added file 'tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h'
 --- tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h	2016-06-30 19:05:07 +0000
@@ -0,0 +1,34 @@
++/*
++ * 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(QString testScenario READ testScenario WRITE setTestScenario)
++
++public:
++    QString testScenario() const;
++    void setTestScenario(QString testScenario);
++};
++
++#endif // MOCK_UNITY_SESSIONSMODEL_H
 === added file 'tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel'
 --- tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/QLightDM/SessionsModel	2016-06-30 19:05:07 +0000
@@ -0,0 +1,17 @@
++/*
++ * 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"
 === modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -1,7 +1,9 @@
  set(LibLightDM_SOURCES
      Greeter.cpp
++    SessionsModel.cpp
      UsersModel.cpp
      GreeterPrivate.cpp
++    SessionsModelPrivate.cpp
      UsersModelPrivate.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+     )
 === modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-06-30 19:05:01 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-06-30 19:05:07 +0000
@@ -51,7 +51,7 @@
  QString Greeter::defaultSessionHint() const
+ {
--    return "ubuntu";
++    return QStringLiteral("ubuntu");
+ }
  bool Greeter::hideUsersHint() const
 === added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,99 @@
++/*
++ * 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/>.
++ *
++ */
++
++
++// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
++// To use the same method of setting role name that it does, we
++// set our compatibility to Qt4 here too.
++#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
++
++#include "SessionsModel.h"
++#include "SessionsModelPrivate.h"
++#include <QtCore/QDir>
++#include <QtCore/QString>
++
++namespace QLightDM
++{
++
++SessionsModel::SessionsModel(QObject* parent) :
++    QAbstractListModel(parent),
++    d_ptr(new SessionsModelPrivate(this))
++{
++    Q_D(SessionsModel);
++    m_roleNames = QAbstractListModel::roleNames();
++    m_roleNames[KeyRole] = "key";
++    m_roleNames[TypeRole] = "type";
++}
++
++SessionsModel::~SessionsModel()
++{
++    delete d_ptr;
++}
++
++QVariant SessionsModel::data(const QModelIndex& index, int role) const
++{
++    Q_D(const SessionsModel);
++
++    if(!index.isValid()) {
++        return QVariant();
++    }
++
++    int row = index.row();
++
++    switch (role) {
++        case QLightDM::SessionsModel::KeyRole:
++            return d->sessionItems[row].key;
++        case Qt::DisplayRole:
++            return d->sessionItems[row].name;
++        default:
++            return QVariant();
++    }
++}
++
++QHash<int, QByteArray> SessionsModel::roleNames() const
++{
++    return m_roleNames;
++}
++
++int SessionsModel::rowCount(const QModelIndex& parent) const
++{
++    Q_D(const SessionsModel);
++
++    if (parent.isValid()) {
++        return 0;
++    } else { // parent is root
++        return d->sessionItems.size();
++    }
++}
++
++QString SessionsModel::testScenario() const
++{
++    Q_D(const SessionsModel);
++    return d->testScenario;
++}
++
++void SessionsModel::setTestScenario(QString testScenario)
++{
++    Q_D(SessionsModel);
++
++    if (d->testScenario != testScenario) {
++        d->testScenario = testScenario;
++        d->resetEntries();
++    }
++}
++
++} // namespace QLightDM
 === added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h	2016-06-30 19:05:07 +0000
@@ -0,0 +1,72 @@
++/*
++ * 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 UNITY_MOCK_SESSIONSMODEL_H
++#define UNITY_MOCK_SESSIONSMODEL_H
++
++#include <QtCore/QAbstractListModel>
++#include <QtCore/QString>
++
++namespace QLightDM
++{
++class SessionsModelPrivate;
++
++class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
++    {
++        Q_OBJECT
++
++        Q_ENUMS(SessionModelRoles SessionType)
++
++        // Mock-only API for testing purposes
++        Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
++
++    public:
++
++        enum SessionModelRoles {
++            //name is exposed as Qt::DisplayRole
++            //comment is exposed as Qt::TooltipRole
++            KeyRole = Qt::UserRole,
++            IdRole = KeyRole, /** Deprecated */
++            TypeRole
++        };
++
++        enum SessionType {
++            LocalSessions,
++            RemoteSessions
++        };
++
++        explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
++        explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
++        virtual ~SessionsModel();
++
++        QHash<int, QByteArray> roleNames() const override;
++        int rowCount(const QModelIndex& parent) const override;
++        QVariant data(const QModelIndex& index, int role) const override;
++
++        QString testScenario() const;
++        void setTestScenario(QString testScenario);
++
++    protected:
++        SessionsModelPrivate* const d_ptr;
++
++    private:
++        QHash<int, QByteArray> m_roleNames;
++        Q_DECLARE_PRIVATE(SessionsModel)
++    };
++}
++
++#endif // UNITY_MOCK_SESSIONSMODEL_H
 === added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,73 @@
++/*
++ * 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 "SessionsModel.h"
++#include "SessionsModelPrivate.h"
++
++namespace QLightDM
++{
++
++SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
++    : testScenario("singleSession")
++    , q_ptr(parent)
++{
++    resetEntries();
++}
++
++void SessionsModelPrivate::resetEntries()
++{
++    Q_Q(SessionsModel);
++
++    q->beginResetModel();
++        if (testScenario == "multipleSessions") {
++            resetEntries_multipleSessions();
++        } else if (testScenario == "noSessions") {
++            resetEntries_noSessions();
++        } else {
++            resetEntries_singleSession();
++        }
++    q->endResetModel();
++}
++
++void SessionsModelPrivate::resetEntries_multipleSessions()
++{
++    sessionItems =
++        {
++            {"ubuntu", "", "Ubuntu", ""},
++            {"ubuntu-2d", "", "Ubuntu 2D", ""},
++            {"gnome", "", "GNOME", ""},
++            {"gnome-classic", "", "GNOME Classic", ""},
++            {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
++            {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
++            {"gnome-wayland", "", "GNOME on Wayland", ""},
++            {"plasma", "", "Plasma", ""},
++            {"kde", "", "KDE" , ""},
++            {"xterm", "", "Recovery Console", ""},
++            {"", "", "Unknown?", ""}
++        };
++}
++
++void SessionsModelPrivate::resetEntries_noSessions()
++{
++    sessionItems = {};
++}
++
++void SessionsModelPrivate::resetEntries_singleSession()
++{
++    sessionItems = {{"ubuntu", "", "Ubuntu", ""}};
++}
++
++} // namespace QLightDM
 === added file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h	2016-06-30 19:05:07 +0000
@@ -0,0 +1,59 @@
++/*
++ * 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 UNITY_MOCK_SESSIONSMODEL_PRIVATE_H
++#define UNITY_MOCK_SESSIONSMODEL_PRIVATE_H
++
++#include <QtCore/QList>
++#include <QtCore/QString>
++
++namespace QLightDM
++{
++class SessionsModel;
++
++class SessionItem
++{
++public:
++    QString key;
++    QString type; // unused
++    QString name;
++    QString comment; // unused
++};
++
++class SessionsModelPrivate
++{
++public:
++    explicit SessionsModelPrivate(SessionsModel* parent=0);
++    virtual ~SessionsModelPrivate() = default;
++
++    QList<SessionItem> sessionItems;
++    QString testScenario;
++
++    void resetEntries();
++protected:
++    SessionsModel* const q_ptr;
++
++private:
++    void resetEntries_multipleSessions();
++    void resetEntries_noSessions();
++    void resetEntries_singleSession();
++    Q_DECLARE_PUBLIC(SessionsModel)
++};
++
++} // namespace QLightDM
++
++#endif // UNITY_MOCK_SESSIONSMODEL_PRIVATE_H
 === modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-18 22:37:48 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-30 19:05:07 +0000
@@ -60,7 +60,7 @@
+ {
      entries =
+     {
--        { "single", "Single User", 0, 0, false, false, 0, 0, 0 },
++        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
      };
+ }
@@ -68,7 +68,7 @@
+ {
      entries =
+     {
--        { "single", "Single User", 0, 0, false, false, 0, 0, 0 },
++        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
      };
+ }
@@ -76,7 +76,7 @@
+ {
      entries =
+     {
--        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0, 0 },
++        { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
      };
+ }
@@ -84,26 +84,26 @@
+ {
      entries =
+     {
--        { "has-password",      "Has Password", 0, 0, false, false, 0, 0, 0 },
--        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0, 0 },
--        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0, 0 },
--        { "no-password",       "No Password", 0, 0, false, false, 0, 0, 0 },
--        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0, 0 },
--        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0, 0 },
--        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0, 0 },
--        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0, 0 },
--        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0, 0 },
--        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0, 0 },
--        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0, 0 },
--        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, 0, 0, 0 },
--        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 0, 0 },
++        { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
++        { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
++        { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
++        { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
++        { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
++        { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
++        { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
++        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
++        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
++        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
++        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
++        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
++        { "color-background",  "Color Background", "#dd4814", 0, false, false, "ubuntu", 0 },
          // white and black are a bit redundant, but useful for manually testing if UI is still readable
--        { "white-background",  "White Background", "#ffffff", 0, false, false, 0, 0, 0 },
--        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0, 0 },
--        { "no-background",     "No Background", "", 0, false, false, 0, 0, 0 },
--        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0, 0 },
--        { "no-response",       "No Response", 0, 0, false, false, 0, 0, 0 },
--        { "empty-name",        "", 0, 0, false, false, 0, 0, 0 },
++        { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
++        { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
++        { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
++        { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
++        { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
++        { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
      };
+ }
 === modified file 'tests/mocks/LightDM/IntegratedLightDM/plugin.cpp'
 --- tests/mocks/LightDM/IntegratedLightDM/plugin.cpp	2016-06-30 19:05:01 +0000
 +++ tests/mocks/LightDM/IntegratedLightDM/plugin.cpp	2016-06-30 19:05:07 +0000
@@ -18,7 +18,9 @@
  #include <DBusGreeter.h>
  #include <DBusGreeterList.h>
  #include "MockGreeter.h"
++#include "MockSessionsModel.h"
  #include "MockUsersModel.h"
++#include <QLightDM/SessionsModel>
  #include "ColorTheme.h"
  #include "UserMetrics.h"
  #include <QLightDM/UsersModel>
@@ -39,6 +41,13 @@
      return greeter;
+ }
++static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new MockSessionsModel;
++}
++
  static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
      Q_UNUSED(engine)
@@ -62,6 +71,8 @@
      qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
      qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
      qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
++    qmlRegisterSingletonType<MockSessionsModel>(uri, 0, 1, "Sessions", sessions_provider);
++    qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", "Type is not instantiable");
      qmlRegisterSingletonType<MockUsersModel>(uri, 0, 1, "Users", users_provider);
      qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
      qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
 === modified file 'tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
 --- tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-06-30 19:05:01 +0000
 +++ tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt	2016-06-30 19:05:07 +0000
@@ -44,6 +44,29 @@
+     )
  add_qmltest_target(testGreeterPam GreeterPamTestExec COMMAND $<TARGET_FILE:GreeterPamTestExec>)
++# SessionsModelTest
++add_executable(GreeterSessionsModelTestExec
++    sessionsmodel.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/LightDM/SessionsModel.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
++    )
++add_dependencies(GreeterSessionsModelTestExec MockLightDM)
++qt5_use_modules(GreeterSessionsModelTestExec Core Test)
++target_link_libraries(GreeterSessionsModelTestExec
++    MockLightDM
++    )
++target_include_directories(GreeterSessionsModelTestExec PUBLIC
++    ${CMAKE_SOURCE_DIR}/plugins/LightDM
++    ${CMAKE_SOURCE_DIR}/plugins/Utils
++    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
++    )
++add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
++    ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
++    DEPENDS MockLightDM
++    LIGHTDM
++    )
++
++# UsersModelTest
  add_executable(GreeterUsersModelTestExec
      usersmodel.cpp
      ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
 === added file 'tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp'
 --- tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp	2016-06-30 19:05:07 +0000
@@ -0,0 +1,96 @@
++/*
++ * 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 "SessionsModel.h"
++
++#include <QLightDM/SessionsModel>
++#include <QtCore/QModelIndex>
++#include <QtTest>
++#include <QString>
++
++class GreeterSessionsModelTest : public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++
++    void init()
++    {
++        model = new SessionsModel();
++        QVERIFY(model);
++        sourceModel = new QLightDM::SessionsModel();
++        QVERIFY(sourceModel);
++    }
++
++    void cleanup()
++    {
++        delete model;
++        delete sourceModel;
++    }
++
++    static QModelIndex findByKey(QAbstractItemModel *model, const QString& key)
++    {
++        for (int i = 0; i < model->rowCount(QModelIndex()); i++) {
++            if (model->data(model->index(i, 0), QLightDM::SessionsModel::KeyRole).toString() == key)
++                return model->index(i, 0);
++        }
++
++        return QModelIndex();
++    }
++
++    void testIconDirectoriesAreValid()
++    {
++        Q_FOREACH(const QUrl& searchDirectory, model->iconSearchDirectories())
++        {
++            QVERIFY(searchDirectory.isValid());
++        }
++    }
++
++    void testMultipleSessionsCountIsCorrect()
++    {
++        sourceModel->setTestScenario("multipleSessions");
++        QVERIFY(sourceModel->rowCount(QModelIndex()) > 1);
++    }
++
++    void testNoSessionsCountIsCorrect()
++    {
++        sourceModel->setTestScenario("noSessions");
++        QVERIFY(sourceModel->rowCount(QModelIndex()) == 0);
++    }
++
++    void testSingleSessionCountIsCorrect()
++    {
++        sourceModel->setTestScenario("singleSession");
++        QVERIFY(sourceModel->rowCount(QModelIndex()) == 1);
++    }
++
++    void testSessionNameIsCorrect()
++    {
++        // This is testing the lookup, not the correctness of the strings,
++        // so one test should be sufficient
++        sourceModel->setTestScenario("multipleSessions");
++        QVERIFY(model->data(findByKey(sourceModel, "ubuntu"),
++                Qt::DisplayRole).toString() == "Ubuntu");
++    }
++
++private:
++    SessionsModel *model;
++    QLightDM::SessionsModel *sourceModel;
++};
++
++QTEST_MAIN(GreeterSessionsModelTest)
++
++#include "sessionsmodel.moc"
 === modified file 'tests/qmltests/Greeter/TestView.qml'
 --- tests/qmltests/Greeter/TestView.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/Greeter/TestView.qml	2016-05-25 19:25:51 +0000
@@ -43,7 +43,6 @@
      signal responded(string response)
      signal tease()
      signal emergencyCall()
--    signal promptlessLogin()
      signal _showMessageCalled(string html)
      signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)
 === modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
 --- tests/qmltests/Greeter/tst_Greeter.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/Greeter/tst_Greeter.qml	2016-06-30 19:05:07 +0000
@@ -194,6 +194,8 @@
              var i = getIndexOf(name);
              view.selected(i);
              verifySelected(name);
++            compare(greeter.waiting, true);
++            tryCompare(greeter, "waiting", false);
              return i;
+         }
@@ -325,18 +327,6 @@
              compare(viewShowMessageSpy.signalArguments[2][0], "You should have seen three messages");
+         }
--        function test_waiting() {
--            // Make sure we unset 'waiting' on prompt
--            selectUser("has-password");
--            compare(greeter.waiting, true);
--            tryCompare(greeter, "waiting", false);
--
--            // Make sure we unset 'waiting' on authentication
--            selectUser("no-password");
--            compare(greeter.waiting, true);
--            tryCompare(greeter, "waiting", false);
--        }
--
          function test_locked() {
              selectUser("has-password");
              compare(view.locked, true);
 === modified file 'tests/qmltests/Greeter/tst_WideView.qml'
 --- tests/qmltests/Greeter/tst_WideView.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/Greeter/tst_WideView.qml	2016-06-30 19:05:07 +0000
@@ -63,7 +63,8 @@
+                     }
                      onSelected: {
--                        currentIndexField.text = index;
++                        if (index >= 0)
++                            currentIndexField.text = index;
+                     }
                      QtObject {
@@ -392,7 +393,7 @@
          function test_respondedWithPassword() {
              view.locked = true;
--            view.showPrompt("Prompt", true, true);
++            view.showPrompt("Prompt", true, false);
              var passwordInput = findChild(view, "passwordInput");
              compare(passwordInput.text, "Prompt");
              verify(passwordInput.isSecret);
@@ -454,13 +455,13 @@
              view.showPrompt("Prompt", true, true);
              var promptField = findChild(view, "promptField");
              tap(promptField);
--            compare(promptField.focus, true);
--            compare(promptField.enabled, true);
++            verify(promptField.activeFocus);
++            compare(promptField.opacity, 1);
              typeString("password");
              keyClick(Qt.Key_Enter);
--            compare(promptField.focus, true);
--            compare(promptField.enabled, false);
++            verify(promptField.activeFocus);
++            compare(promptField.opacity, 0); // hidden by fakeLabel
              compare(selectedSpy.count, 0);
              keyClick(Qt.Key_Escape);
@@ -468,8 +469,8 @@
              compare(selectedSpy.signalArguments[0][0], 1);
              view.reset();
--            compare(promptField.focus, false);
--            compare(promptField.enabled, true);
++            verify(promptField.activeFocus);
++            compare(promptField.opacity, 1);
+         }
          function test_unicode() {
@@ -489,6 +490,7 @@
              compare(selectedSpy.signalArguments[0][0], 0);
              selectedSpy.clear();
++            view.reset();
              view.locked = false;
              compare(passwordInput.text, "Log In");
              tap(passwordInput);
@@ -518,13 +520,89 @@
              tryCompare(loginList, "height", view.height);
+         }
--        function test_alphanumeric() {
--            var passwordInput = findChild(view, "passwordInput");
++        function test_passphrase() {
++            var promptField = findChild(view, "promptField");
++            view.showPrompt("", true, true);
              verify(view.alphanumeric);
--            verify(passwordInput.isAlphanumeric);
++            compare(promptField.inputMethodHints & Qt.ImhDigitsOnly, 0);
++
++            keyClick(Qt.Key_D);
++            compare(promptField.text, "d");
++        }
++
++        function test_passcode() {
++            var promptField = findChild(view, "promptField");
++            view.showPrompt("", true, true);
++
              view.alphanumeric = false;
--            verify(!passwordInput.isAlphanumeric);
++            compare(promptField.inputMethodHints & Qt.ImhDigitsOnly, Qt.ImhDigitsOnly);
++
++            keyClick(Qt.Key_D);
++            compare(promptField.text, "");
++
++            keyClick(Qt.Key_0);
++            keyClick(Qt.Key_0);
++            keyClick(Qt.Key_0);
++            keyClick(Qt.Key_0);
++            compare(promptField.text, "0000");
++
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "0000");
++
++            compare(promptField.opacity, 0);
++        }
++
++        function test_loginListMovement_data() {
++            return [
++                {tag: "up", key: Qt.Key_Up, result: -1},
++                {tag: "down", key: Qt.Key_Down, result: 1},
++            ]
++        }
++
++        function test_loginListMovement(data) {
++            keyClick(data.key);
++            compare(selectedSpy.count, 1);
++            compare(selectedSpy.signalArguments[0][0], data.result);
++        }
++
++        function test_focusStaysActive() {
++            var promptField = findChild(view, "promptField");
++            var promptButton = findChild(view, "promptButton");
++
++            verify(promptButton.activeFocus);
++            keyClick(Qt.Key_Enter);
++            compare(selectedSpy.count, 0);
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "");
++            verify(promptButton.activeFocus);
++            keyClick(Qt.Key_Enter);
++            compare(respondedSpy.count, 1);
++
++            view.showPrompt("", true, true);
++            verify(promptField.activeFocus);
++            keyClick(Qt.Key_D);
++            keyClick(Qt.Key_Enter);
++            compare(selectedSpy.count, 0);
++            compare(respondedSpy.count, 2);
++            compare(respondedSpy.signalArguments[1][0], "d");
++            verify(promptField.activeFocus);
++            keyClick(Qt.Key_Enter);
++            compare(respondedSpy.count, 2);
++
++            view.reset();
++            view.locked = true;
++            verify(promptButton.activeFocus);
++            keyClick(Qt.Key_Enter);
++            compare(respondedSpy.count, 2);
++            compare(selectedSpy.count, 1);
++            compare(selectedSpy.signalArguments[0][0], 0);
++            verify(promptButton.activeFocus);
++            keyClick(Qt.Key_Enter);
++            compare(selectedSpy.count, 1);
++
++            view.showPrompt("", true, true);
++            verify(promptField.activeFocus);
+         }
+     }
+ }
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2016-06-30 19:05:07 +0000
@@ -296,7 +296,7 @@
+         }
          function prepareShell() {
--            tryCompare(shell, "enabled", true); // enabled by greeter when ready
++            tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
              WindowStateStorage.clear();
              SurfaceManager.inputMethodSurface.setState(Mir.MinimizedState);
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2016-06-30 19:05:07 +0000
@@ -493,7 +493,7 @@
+         }
          function cleanup() {
--            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
++            tryCompare(shell, "waitingOnGreeter", false); // make sure greeter didn't leave us in disabled state
              shell = null;
              topLevelSurfaceList = null;
@@ -1583,7 +1583,7 @@
              var stageLoader = findChild(shell, "applicationsDisplayLoader");
              verify(stageLoader);
--            tryCompare(shell, "enabled", true); // enabled by greeter when ready
++            tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
              waitUntilShellIsInOrientation(root.physicalOrientation0);
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-06-30 19:05:07 +0000
@@ -456,7 +456,7 @@
          function cleanup() {
              waitForRendering(shell);
              mouseEmulation.checked = true;
--            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
++            tryCompare(shell, "waitingOnGreeter", false); // make sure greeter didn't leave us in disabled state
              tearDown();
              WindowStateStorage.clear();
+         }
@@ -466,7 +466,7 @@
              shellLoader.active = true;
              tryCompare(shellLoader, "status", Loader.Ready);
              removeTimeConstraintsFromSwipeAreas(shellLoader.item);
--            tryCompare(shell, "enabled", true); // enabled by greeter when ready
++            tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
              sessionSpy.target = findChild(shell, "greeter")
              dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");
@@ -818,7 +818,7 @@
                  tryCompare(userlist, "currentIndex", next)
                  tryCompare(userlist, "movingInternally", false)
+             }
--            tryCompare(shell, "enabled", true); // wait for PAM to settle
++            tryCompare(shell, "waitingOnGreeter", false); // wait for PAM to settle
+         }
          function selectUser(name) {
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2016-06-30 19:05:01 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2016-06-30 19:05:07 +0000
@@ -150,7 +150,7 @@
          property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
          function init() {
--            tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
++            tryCompare(shell, "waitingOnGreeter", false); // will be set when greeter is all ready
              var greeter = findChild(shell, "greeter");
              sessionSpy.target = greeter;
              swipeAwayGreeter(true);
@@ -165,7 +165,7 @@
+         }
          function cleanup() {
--            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
++            tryCompare(shell, "waitingOnGreeter", false); // make sure greeter didn't leave us in disabled state
              shellLoader.itemDestroyed = false
@@ -533,10 +533,12 @@
              // Confirm that we start disabled
              compare(promptSpy.count, 0);
--            verify(!shell.enabled);
++            verify(shell.waitingOnGreeter);
++            var coverPageDragHandle = findChild(shell, "coverPageDragHandle");
++            verify(!coverPageDragHandle.enabled);
              // And that we only become enabled once the lockscreen is up
--            tryCompare(shell, "enabled", true);
++            tryCompare(shell, "waitingOnGreeter", false);
              verify(promptSpy.count > 0);
              var lockscreen = findChild(shell, "lockscreen");
              verify(lockscreen.shown);