Merge lp:~ci-train-bot/unity8/unity8-ubuntu-yakkety-landing-078 into lp:unity8

[Michael Zanetti]

want to see a diff

[lp:~ci-train-bot/unity8/unity8-ubuntu-yakkety-landing-078]

2609. By Andrea Cimitan on 2016-09-22

override some Qt Components definitions so we can have sane default values for flick speeds

Approved by: Albert Astals Cid

2610. By Andrea Cimitan on 2016-09-22

Elide the label text inside recent searches panel (LP: #1611796)

Approved by: Albert Astals Cid

2611. By Andrea Cimitan on 2016-09-22

Add a PreviewSingleton module to store some data for previews (LP: #1595235)

Approved by: Albert Astals Cid

2612. By Andrea Cimitan on 2016-09-22

Use PreviewSingleton for PreviewRatingInput and PreviewCommentInput (LP: #1595235)

Approved by: Albert Astals Cid

2613. By Andrea Cimitan on 2016-09-22

rework GenericScopeView PullToRefresh test

Approved by: Albert Astals Cid

2614. By Andrea Cimitan on 2016-09-22

use mouseFlick instead touchFlick for manage_dash_move_current

Approved by: Albert Astals Cid

2615. By Andrea Cimitan on 2016-09-22

add a couple of waiting tricks for a flaky dash test

Approved by: Albert Astals Cid

2616. By Albert Astals Cid on 2016-09-22

LVWPH: update clipItem height when list height changes (LP: #1606935)

Approved by: Andrea Cimitan

2617. By Albert Astals Cid on 2016-09-22

Put the touchdown shape inside a loader

We only create the shape when needed, saving a bit of CPU time when we're just scrolling around the scopes

Doesn't seem to make the touchdown appear time on press noticeably slower

Approved by: Andrea Cimitan, Josh Arenson, Michael Terry, Unity8 CI Bot

2618. By Albert Astals Cid on 2016-09-22

No need for the touchdown in the card for the cardtool

We only use that card to get some size measurements so the touchdown code adds nothing

Approved by: Andrea Cimitan

2619. By Albert Astals Cid on 2016-09-22

Add bottom gradient to the Show Less floating button

Approved by: Andrea Cimitan

2620. By Albert Astals Cid on 2016-09-22

Remove artShapeSize from non cardtool cards

artShapeSize is only used in the cardtool card to read the value them we pass down in fixedArtShapeSize

According to qmlprofiler evaluating this useless binding accounts for ~0.5% when scrolling up and down a very long scope

Approved by: Andrea Cimitan

2621. By Albert Astals Cid on 2016-09-22

LVWPH: Fix case in which header was shown incorrectly

Making the list smaller did not move the header so it ended up being in view

Approved by: Josh Arenson

2622. By Albert Astals Cid on 2016-09-22

LVWPH: Fix items cut on top in the dash (or at least some instances of it)

This reverts a workaround for tests failing introduced in r2121

The commit log of that revision says "The other solutions involve implementing maxYExtent"
which we actually implemented in r2351 so the workaround would not seem needed anymore
and on top of it is causing brokenness so remove it

Approved by: Josh Arenson

2623. By Albert Astals Cid on 2016-09-22

Reduce calls to CardCreatorCache.getCardComponent while the component is being created

As it is right now on the phone we do calls with empty cardTool.artShapeStyle and cardTool.categoryLayout
that are useless so protect against it to save time. This is not reproducible on the desktop (there's a different Qt though 5.6 vs 5.4) (LP: #1615675)

Approved by: Andrea Cimitan

2624. By Albert Astals Cid on 2016-09-22

Dash::test_cardIconStyle change compare into tryCompareFunction

On very slow machines (CI or valgrind) the UCProportionalShape is not created immediately so give it some slack

Approved by: Andrea Cimitan

2625. By Albert Astals Cid on 2016-09-22

Make PreviewActionsTest::test_comboButton more stable

We also wait for the buttonGroup height to have settled otherwise the mouse clicks can end up in the wrong place

Approved by: Andrea Cimitan

2626. By Albert Astals Cid on 2016-09-22

Adapt onShiftedContentXChanged to work when the content changes very abruptly

This happens in CI quite a bit (and locally when run under xvfb)

Approved by: Michael Zanetti

2627. By Albert Astals Cid on 2016-09-22

Make tryGenericScopeView show the scope correctly

Approved by: Andrea Cimitan

2628. By Albert Astals Cid on 2016-09-22

Make sure the spinner does not get too close to the title text (LP: #1597392)

Approved by: Lukáš Tinkl

2629. By Albert Astals Cid on 2016-09-22

Show "Pull to refresh" in white when overlaid in low luminance colors (LP: #1596849)

Approved by: Michael Terry

2630. By Josh Arenson on 2016-09-22

Add a frontend to the sessions model and enable a session chooser in the greeter.

Approved by: Michael Terry

2631. By Michael Terry on 2016-09-22

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

2632. By Michael Terry on 2016-09-22

Fix tryShell to actually show appropriate backgrounds for each mock user.

Approved by: Albert Astals Cid

2633. By Michael Terry on 2016-09-22

Add an indicator to the greeter when a user is logged in (only shown if we have more than one user)

Approved by: Albert Astals Cid

2634. By Michael Terry on 2016-09-22

Hide the greeter OSK if indicators are open and don't show the edge tutorial during an emergency call.

Approved by: Albert Astals Cid

2635. By Michael Terry on 2016-09-22

Switch from lockscreen PIN pad to a passcode entry box that uses the OSK.

Approved by: Albert Astals Cid

2636. By Michael Terry on 2016-09-22

Use the default system wallpaper instead of our custom one.

Additionally, crop the default wallpaper instead of rotating it, only darken the wallpaper if it's not the default one, and avoid reloading the wallpaper when the device is rotated.

2637. By Daniel d'Andrada on 2016-09-22

Set progress bar indeterminate when processing signal received. (LP: #1249349)

Approved by: Daniel d'Andrada

2638. By Daniel d'Andrada on 2016-09-22

Implement cursor confinement (LP: #1590099)

Approved by: Lukáš Tinkl

2639. By Lukáš Tinkl on 2016-09-22

Implement edge maximizing (aka window snapping) (LP: #1602628)

Approved by: Daniel d'Andrada

2640. By Albert Astals Cid on 2016-09-22

Make test_Shell non ultra slow again

By setting the timeout to 0 to findChild we know may return null (LP: #1597366)

Approved by: Lukáš Tinkl, Michael Zanetti

2641. By Albert Astals Cid on 2016-09-22

Improve findChild calls inside tryCompareFunction.

findChild has a timeout retry since a while ago. This means that if we have a findChild inside a tryCompareFunction the retries multiply and it takes around 30 minutes for the tryCompareFunction to fail if the findChild is failing, so what we do is set the timeout of findChild to 0.

In other cases we just had a tryCompareFunction that made sure the findChild after it would succeed, since now findChild has a retry mechanism we can just remove that tryCompareFunction altogether.

Approved by: Michał Sawicz, Unity8 CI Bot

2642. By Lukáš Tinkl on 2016-09-22

On the PC platform (as opposed to running on $devices), use the "mute" action instead of silent mode

Approved by: Albert Astals Cid, Unity8 CI Bot

2643. By Lukáš Tinkl on 2016-09-22

Respect Fitt's law wrt the window control buttons in panel (LP: #1611959)

Approved by: Albert Astals Cid

2644. By Lukáš Tinkl on 2016-09-22

Fix 2 failing color-related tests

Approved by: Michał Sawicz

2645. By Michael Terry on 2016-09-22

Update look of infographic a bit

Approved by: Albert Astals Cid

2646. By Michael Terry on 2016-09-22

Make infographic bubbles white even on the default wallpaper.

Approved by: Albert Astals Cid

2647. By Marco Trevisan (Treviño) on 2016-09-22

Indicators, mocks: add fake indicators menuitem to populate mocks with different menu types

Also allow to use fake indicators model in IndicatorsClient

Approved by: Albert Astals Cid, Lukáš Tinkl

2648. By Marco Trevisan (Treviño) on 2016-09-22

IndicatorsClient: use PageHeader and ListItemLayout's

Approved by: Albert Astals Cid

2649. By CI Train Bot Account on 2016-09-22

Releasing 8.14+16.10.20160922-0ubuntu1

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-22 16:58:28 +0000
+++ CMakeLists.txt	2016-09-22 07:47:54 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
 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 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	2016-06-14 17:53:56 +0000
+++ data/unity8-greeter-wrapper	2016-09-22 07:47:54 +0000
@@ -1,8 +1,7 @@
 #!/bin/sh
 # -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2011,2013 Canonical Ltd
-# Author: Michael Terry <[e-mail]>
+# Copyright (C) 2011,2013,2016 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -42,6 +41,8 @@
 SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
 rm -f $SUB_SOCKET # clear socket in case we were hard shut down
 
+echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"
+
 # If touch session script (which sets up grid units and mir variables) is available, use it
 TOUCH_WRAPPER=
 if [ -x /usr/bin/ubuntu-touch-session ]; then
@@ -65,7 +66,14 @@
 MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &
 INIT_PID=$!
 while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
-export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
+. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"
+export UPSTART_SESSION
+
+# Connect upstart to system, but do first command in a loop to avoid any
+# race condition between the session file above being written and upstart being
+# ready to handle requests.
+while ! /sbin/initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done
+/sbin/initctl start notify-cgmanager
 
 # Start any pre-greeter tasks if needed (like wizard)
 /sbin/initctl emit unity8-greeter-starting

=== modified file 'debian/changelog'
--- debian/changelog	2016-08-31 11:56:09 +0000
+++ debian/changelog	2016-09-22 07:47:54 +0000
@@ -1,3 +1,80 @@
+unity8 (8.14+16.10.20160922-0ubuntu1) yakkety; urgency=medium
+
+  [ Albert Astals Cid ]
+  * LVWPH: update clipItem height when list height changes (LP:
+    #1606935)
+  * Put the touchdown shape inside a loader
+  * No need for the touchdown in the card for the cardtool
+  * Add bottom gradient to the Show Less floating button
+  * Remove artShapeSize from non cardtool cards
+  * LVWPH: Fix case in which header was shown incorrectly
+  * LVWPH: Fix items cut on top in the dash (or at least some instances
+    of it)
+  * Reduce calls to CardCreatorCache.getCardComponent while the
+    component is being created (LP: #1615675)
+  * Dash::test_cardIconStyle change compare into tryCompareFunction
+  * Make PreviewActionsTest::test_comboButton more stable
+  * Adapt onShiftedContentXChanged to work when the content changes very
+    abruptly
+  * Make tryGenericScopeView show the scope correctly
+  * Make sure the spinner does not get too close to the title text (LP:
+    #1597392)
+  * Show "Pull to refresh" in white when overlaid in low luminance
+    colors (LP: #1596849)
+  * Make test_Shell non ultra slow again (LP: #1597366)
+  * Improve findChild calls inside tryCompareFunction.
+
+  [ Andrea Cimitan ]
+  * override some Qt Components definitions so we can have sane default
+    values for flick speeds
+  * Elide the label text inside recent searches panel (LP: #1611796)
+  * Add a PreviewSingleton module to store some data for previews (LP:
+    #1595235)
+  * Use PreviewSingleton for PreviewRatingInput and PreviewCommentInput
+    (LP: #1595235)
+  * rework GenericScopeView PullToRefresh test
+  * use mouseFlick instead touchFlick for manage_dash_move_current
+  * add a couple of waiting tricks for a flaky dash test
+
+  [ Daniel d'Andrada ]
+  * Set progress bar indeterminate when processing signal received. (LP:
+    #1249349)
+  * Implement cursor confinement (LP: #1590099)
+
+  [ Josh Arenson ]
+  * Add a frontend to the sessions model and enable a session chooser in
+    the greeter.
+
+  [ Lukáš Tinkl ]
+  * Implement edge maximizing (aka window snapping) (LP: #1602628)
+  * On the PC platform (as opposed to running on $devices), use the
+    "mute" action instead of silent mode
+  * Respect Fitt's law wrt the window control buttons in panel (LP:
+    #1611959)
+  * Fix 2 failing color-related tests
+
+  [ Marco Trevisan (Treviño) ]
+  * Indicators, mocks: add fake indicators menuitem to populate mocks
+    with different menu types
+  * IndicatorsClient: use PageHeader and ListItemLayout's
+
+  [ Michael Terry ]
+  * Support launching apps inside a unity8 session from the greeter and
+    support emergency dialing inside the greeter.
+  * Fix tryShell to actually show appropriate backgrounds for each mock
+    user.
+  * Add an indicator to the greeter when a user is logged in (only shown
+    if we have more than one user)
+  * Hide the greeter OSK if indicators are open and don't show the edge
+    tutorial during an emergency call.
+  * Switch from lockscreen PIN pad to a passcode entry box that uses the
+    OSK.
+  * Use the default system wallpaper instead of our custom one.
+  * Update look of infographic a bit
+  * Make infographic bubbles white even on the default wallpaper.
+
+ -- Michał Sawicz <[e-mail]>  Thu, 22 Sep 2016 07:46:57 +0000
+
 unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'debian/control'
--- debian/control	2016-08-22 16:58:28 +0000
+++ debian/control	2016-09-22 07:47:54 +0000
@@ -11,9 +11,9 @@
 # to g++ so we don't try to run arm g++
 # on an x86 CPU for example, when cross-compiling.
                g++:native,
-               libandroid-properties-dev,
                graphviz,
                gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
+               libandroid-properties-dev,
                libconnectivity-qt1-dev (>= 0.7.1),
                libevdev-dev,
                libgeonames-dev (>= 0.2),
@@ -32,10 +32,12 @@
                libqt5svg5-dev,
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
+               libubuntu-download-manager-common-dev,
                libubuntugestures5-dev (>= 1.3.2030),
                libubuntugestures5-private-dev (>= 1.3.2030),
                libudev-dev,
-               libunity-api-dev (>= 7.118),
+               libudm-common-dev,
+               libunity-api-dev (>= 7.119),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!arm64 !armhf],
@@ -133,6 +135,7 @@
          ${shlibs:Depends},
 Recommends: indicator-keyboard,
             indicator-session,
+            unity-greeter-session-broadcast,
             unity-scope-click,
             unity-scope-mediascanner2,
 Breaks: indicator-network (<< 0.5.1+14.10.20141014),
@@ -153,7 +156,8 @@
          qtdeclarative5-ubuntu-settings-components (>= 0.7),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-21,
+         ubuntu-wallpapers,
+         unity-application-impl-22,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-12,
@@ -199,7 +203,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-21,
+          unity-application-impl-22,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'debian/rules'
--- debian/rules	2016-06-20 14:56:40 +0000
+++ debian/rules	2016-09-22 07:47:54 +0000
@@ -37,6 +37,7 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
 
-# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist
 override_dh_shlibdeps:
-	dh_shlibdeps -XlibMockLightDM-qml.so
+	# 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

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2016-06-07 16:10:36 +0000
+++ debian/unity8-private.install	2016-09-22 07:47:54 +0000
@@ -4,6 +4,7 @@
 usr/lib/*/unity8/qml/Dash
 usr/lib/*/unity8/qml/GlobalShortcut
 usr/lib/*/unity8/qml/Greeter
+usr/lib/*/unity8/qml/ImageCache
 usr/lib/*/unity8/qml/LightDM
 usr/lib/*/unity8/qml/Lights
 usr/lib/*/unity8/qml/Powerd

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2016-05-25 22:11:50 +0000
+++ plugins/CMakeLists.txt	2016-09-22 07:47:54 +0000
@@ -15,6 +15,7 @@
 add_subdirectory(Cursor)
 add_subdirectory(GlobalShortcut)
 add_subdirectory(Greeter)
+add_subdirectory(ImageCache)
 add_subdirectory(LightDM)
 add_subdirectory(Lights)
 add_subdirectory(Dash)

=== modified file 'plugins/Cursor/CMakeLists.txt'
--- plugins/Cursor/CMakeLists.txt	2016-06-02 09:32:33 +0000
+++ plugins/Cursor/CMakeLists.txt	2016-09-22 07:47:54 +0000
@@ -28,6 +28,6 @@
     ${QT5PLATFORM_SUPPORT_LDFLAGS}
 )
 
-qt5_use_modules(Cursor-qml Qml Quick DBus Network Gui Sql Concurrent Svg)
+qt5_use_modules(Cursor-qml Qml Quick Svg)
 
-add_unity8_plugin(Cursor 1.0 Cursor TARGETS Cursor-qml)
+add_unity8_plugin(Cursor 1.1 Cursor TARGETS Cursor-qml)

=== modified file 'plugins/Cursor/MousePointer.cpp'
--- plugins/Cursor/MousePointer.cpp	2016-06-20 07:27:19 +0000
+++ plugins/Cursor/MousePointer.cpp	2016-09-22 07:47:54 +0000
@@ -22,6 +22,7 @@
 
 #include <QQuickWindow>
 #include <QGuiApplication>
+#include <QtMath>
 
 #include <qpa/qwindowsysteminterface.h>
 
@@ -49,28 +50,77 @@
     m_accumulatedMovement -= appliedMovement;
 
     qreal newX = x() + appliedMovement.x();
-    if (newX < 0) {
+    qreal newY = y() + appliedMovement.y();
+    const qreal sceneWidth = parentItem()->width();
+    const qreal sceneHeight = parentItem()->height();
+
+    if (newX <= 0 && newY < m_topBoundaryOffset) { // top left corner
+        const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-m_topBoundaryOffset, 2));
+        Q_EMIT pushedTopLeftCorner(qAbs(distance), buttons);
+        m_pushing = true;
+    } else if (newX >= sceneWidth-1 && newY < m_topBoundaryOffset) { // top right corner
+        const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-m_topBoundaryOffset, 2));
+        Q_EMIT pushedTopRightCorner(qAbs(distance), buttons);
+        m_pushing = true;
+    } else if (newX < 0 && newY >= sceneHeight-1) { // bottom left corner
+        const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-sceneHeight, 2));
+        Q_EMIT pushedBottomLeftCorner(qAbs(distance), buttons);
+        m_pushing = true;
+    } else if (newX >= sceneWidth-1 && newY >= sceneHeight-1) { // bottom right corner
+        const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-sceneHeight, 2));
+        Q_EMIT pushedBottomRightCorner(qAbs(distance), buttons);
+        m_pushing = true;
+    } else if (newX < 0) { // left edge
         Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);
-        newX = 0;
-    } else if (newX >= parentItem()->width()) {
-        Q_EMIT pushedRightBoundary(newX - (parentItem()->width() - 1), buttons);
-        newX = parentItem()->width() - 1;
-    }
-    setX(newX);
-
-    qreal newY = y() + appliedMovement.y();
-    if (newY < 0) {
-        newY = 0;
-    } else if (newY >= parentItem()->height()) {
-        newY = parentItem()->height() - 1;
-    }
-    setY(newY);
+        m_pushing = true;
+    } else if (newX >= sceneWidth) { // right edge
+        Q_EMIT pushedRightBoundary(newX - (sceneWidth - 1), buttons);
+        m_pushing = true;
+    } else if (newY < m_topBoundaryOffset) { // top edge
+        Q_EMIT pushedTopBoundary(qAbs(newY - m_topBoundaryOffset), buttons);
+        m_pushing = true;
+    } else if (Q_LIKELY(newX > 0 && newX < sceneWidth-1 && newY > 0 && newY < sceneHeight-1)) { // normal pos, not pushing
+        if (m_pushing) {
+            Q_EMIT pushStopped();
+            m_pushing = false;
+        }
+    }
+
+    applyItemConfinement(newX, newY);
+
+    setX(qBound(0.0, newX, sceneWidth - 1));
+    setY(qBound(0.0, newY, sceneHeight - 1));
 
     QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
     QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,
         buttons, modifiers);
 }
 
+void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)
+{
+    Q_ASSERT(parentItem() != nullptr);
+
+    if (m_confiningItem.isNull()) {
+        return;
+    }
+
+    QRectF confiningItemGeometry(0, 0, m_confiningItem->width(), m_confiningItem->height());
+
+    QRectF confiningRect = m_confiningItem->mapRectToItem(parentItem(), confiningItemGeometry);
+
+    if (newX < confiningRect.x()) {
+        newX = confiningRect.x();
+    } else if (newX > confiningRect.right()) {
+        newX = confiningRect.right();
+    }
+
+    if (newY < confiningRect.y()) {
+        newY = confiningRect.y();
+    } else if (newY > confiningRect.bottom()) {
+        newY = confiningRect.bottom();
+    }
+}
+
 void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
 {
     if (!parentItem()) {
@@ -82,6 +132,20 @@
             QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
 }
 
+int MousePointer::topBoundaryOffset() const
+{
+    return m_topBoundaryOffset;
+}
+
+void MousePointer::setTopBoundaryOffset(int topBoundaryOffset)
+{
+    if (m_topBoundaryOffset == topBoundaryOffset)
+        return;
+
+    m_topBoundaryOffset = topBoundaryOffset;
+    Q_EMIT topBoundaryOffsetChanged(topBoundaryOffset);
+}
+
 void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)
 {
     if (change == ItemSceneChange) {
@@ -156,3 +220,16 @@
 {
     CursorImageProvider::instance()->setCustomCursor(customCursor);
 }
+
+QQuickItem* MousePointer::confiningItem() const
+{
+    return m_confiningItem.data();
+}
+
+void MousePointer::setConfiningItem(QQuickItem *item)
+{
+    if (item != m_confiningItem) {
+        m_confiningItem = item;
+        Q_EMIT confiningItemChanged();
+    }
+}

=== modified file 'plugins/Cursor/MousePointer.h'
--- plugins/Cursor/MousePointer.h	2016-06-17 01:13:22 +0000
+++ plugins/Cursor/MousePointer.h	2016-09-22 07:47:54 +0000
@@ -27,6 +27,8 @@
 
 class MousePointer : public MirMousePointerInterface {
     Q_OBJECT
+    Q_PROPERTY(QQuickItem* confiningItem READ confiningItem WRITE setConfiningItem NOTIFY confiningItemChanged)
+    Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)
 public:
     MousePointer(QQuickItem *parent = nullptr);
 
@@ -38,6 +40,12 @@
 
     void setCustomCursor(const QCursor &) override;
 
+    QQuickItem* confiningItem() const;
+    void setConfiningItem(QQuickItem*);
+
+    int topBoundaryOffset() const;
+    void setTopBoundaryOffset(int topBoundaryOffset);
+
 public Q_SLOTS:
     void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
             Qt::KeyboardModifiers modifiers) override;
@@ -46,7 +54,16 @@
 Q_SIGNALS:
     void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
     void pushedRightBoundary(qreal amount, Qt::MouseButtons buttons);
+    void pushedTopBoundary(qreal amount, Qt::MouseButtons buttons);
+    void pushedTopLeftCorner(qreal amount, Qt::MouseButtons buttons);
+    void pushedTopRightCorner(qreal amount, Qt::MouseButtons buttons);
+    void pushedBottomLeftCorner(qreal amount, Qt::MouseButtons buttons);
+    void pushedBottomRightCorner(qreal amount, Qt::MouseButtons buttons);
+    void pushStopped();
     void mouseMoved();
+    void confiningItemChanged();
+
+    void topBoundaryOffsetChanged(int topBoundaryOffset);
 
 protected:
     void itemChange(ItemChange change, const ItemChangeData &value) override;
@@ -56,6 +73,7 @@
 
 private:
     void registerWindow(QWindow *window);
+    void applyItemConfinement(qreal &newX, qreal &newY);
 
     QPointer<QWindow> m_registeredWindow;
     QPointer<QScreen> m_registeredScreen;
@@ -64,6 +82,11 @@
 
     // Accumulated, unapplied, mouse movement.
     QPointF m_accumulatedMovement;
+
+    QPointer<QQuickItem> m_confiningItem;
+
+    int m_topBoundaryOffset{0};
+    bool m_pushing{false};
 };
 
 #endif // MOUSEPOINTER_H

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2016-08-08 08:32:27 +0000
+++ plugins/Dash/CardCreator.js	2016-09-22 07:47:54 +0000
@@ -331,13 +331,15 @@
                         }\n';
 
 // %1 is used as anchors of touchdown effect
-var kTouchdownCode = 'UbuntuShape { \n\
-                        id: touchdown; \n\
-                        objectName: "touchdown"; \n\
+var kTouchdownCode = 'Loader { \n\
+                        active: root.pressed; \n\
                         anchors { %1 } \n\
-                        visible: root.pressed; \n\
-                        radius: "medium"; \n\
-                        borderSource: "radius_pressed.sci" \n\
+                        sourceComponent: UbuntuShape { \n\
+                            objectName: "touchdown"; \n\
+                            anchors.fill: parent; \n\
+                            radius: "medium"; \n\
+                            borderSource: "radius_pressed.sci" \n\
+                        } \n\
                     }\n';
 
 // %1 is used as anchors of subtitleLabel
@@ -506,10 +508,10 @@
     }
 
     if (hasArt) {
-        code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
-
         var artShapeAspect;
         if (isCardTool) {
+            code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
+
             var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;
             if (isNaN(artShapeAspect)) {
                 artShapeAspect = 1;
@@ -573,7 +575,7 @@
                                   .arg(artShapeHolderShapeCode)
                                   .arg(fallbackStatusCode)
                                   .arg(fallbackURICode);
-    } else {
+    } else if (isCardTool) {
         code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
     }
 
@@ -923,7 +925,7 @@
         code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
     }
 
-    if (artShapeStyle != "shadow" && artShapeStyle != "icon") {
+    if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {
         var touchdownAnchors;
         if (hasBackground) {
             touchdownAnchors = 'fill: backgroundLoader';

=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2016-06-27 18:45:19 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2016-09-22 07:47:54 +0000
@@ -587,6 +587,10 @@
                 } else {
                     m_headerItem->setY(-m_minYExtent);
                 }
+            } else if (m_headerItemShownHeight == 0 && m_previousContentY > m_headerItem->y() && contentY() < m_headerItem->y()) {
+                // The header was hidden but now that we've moved up (e.g. because of item removed) it's visible
+                // make sure it isn't
+                m_headerItem->setY(-m_minYExtent);
             }
             Q_EMIT headerItemShownHeightChanged();
         } else {
@@ -978,6 +982,7 @@
 
 void ListViewWithPageHeader::onHeightChanged()
 {
+    m_clipItem->setHeight(height() - m_headerItemShownHeight);
     polish();
 }
 
@@ -1388,10 +1393,6 @@
 
         m_contentHeightDirty = false;
         adjustMinYExtent();
-        if (contentHeight + m_minYExtent < height()) {
-            // need this since in the previous call to adjustMinYExtent contentHeight is not set yet
-            m_minYExtent = 0;
-        }
         m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();
         setContentHeight(contentHeight);
         m_inContentHeightKeepHeaderShown = false;

=== added directory 'plugins/ImageCache'
=== added file 'plugins/ImageCache/CMakeLists.txt'
--- plugins/ImageCache/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/ImageCache/CMakeLists.txt	2016-09-22 07:47:54 +0000
@@ -0,0 +1,8 @@
+add_library(ImageCache-qml MODULE
+    ImageCache.cpp
+    plugin.cpp
+    )
+
+qt5_use_modules(ImageCache-qml Gui Qml Quick)
+
+add_unity8_plugin(ImageCache 0.1 ImageCache TARGETS ImageCache-qml)

=== added file 'plugins/ImageCache/ImageCache.cpp'
--- plugins/ImageCache/ImageCache.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ImageCache/ImageCache.cpp	2016-09-22 07:47:54 +0000
@@ -0,0 +1,135 @@
+/*
+ * 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 <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QUrl>
+#include <QUrlQuery>
+
+#include "ImageCache.h"
+
+ImageCache::ImageCache()
+  : QQuickImageProvider(QQmlImageProviderBase::Image,
+                        QQmlImageProviderBase::ForceAsynchronousImageLoading)
+{
+}
+
+QString ImageCache::imageCacheRoot()
+{
+    QString xdgCache(qgetenv("XDG_CACHE_HOME"));
+    if (xdgCache.isEmpty()) {
+        xdgCache = QDir::homePath() + QStringLiteral("/.cache");
+    }
+
+    return QDir::cleanPath(xdgCache) + QStringLiteral("/unity8/imagecache");
+}
+
+QFileInfo ImageCache::imagePath(const QUrl &image)
+{
+    QUrlQuery query(image);
+
+    auto name = query.queryItemValue(QStringLiteral("name"));
+    if (name.isEmpty()) {
+        name = QStringLiteral("/paths") + image.toLocalFile();
+    } else {
+        name = QStringLiteral("/names/") + name;
+    }
+
+    return QFileInfo(imageCacheRoot() + name);
+}
+
+bool ImageCache::needsUpdate(const QUrl &image, const QFileInfo &cachePath, const QSize &imageSize, const QSize &requestedSize, QSize &finalSize)
+{
+    if (!cachePath.exists())
+        return true;
+
+    QFileInfo imageInfo(image.toLocalFile());
+    if (imageInfo.lastModified() > cachePath.lastModified())
+        return true;
+
+    QSize cacheSize(QImageReader(cachePath.filePath()).size());
+    finalSize = calculateSize(imageSize, requestedSize);
+    if (finalSize.isValid() && cacheSize != finalSize)
+        return true;
+
+    return false;
+}
+
+QSize ImageCache::calculateSize(const QSize &imageSize, const QSize &requestedSize)
+{
+    QSize finalSize(requestedSize);
+
+    if (finalSize.width() == 0) {
+        finalSize.setWidth(imageSize.width() * (((double)finalSize.height()) / imageSize.height()));
+    } else if (finalSize.height() == 0) {
+        finalSize.setHeight(imageSize.height() * (((double)finalSize.width()) / imageSize.width()));
+    }
+
+    return finalSize;
+}
+
+QImage ImageCache::loadAndCacheImage(QImageReader &reader, const QFileInfo &cachePath, const QSize &finalSize)
+{
+    reader.setQuality(100);
+    reader.setScaledSize(finalSize);
+    auto format = reader.format(); // can't get this after reading
+
+    QImage loadedImage(reader.read());
+    if (loadedImage.isNull()) {
+        qWarning() << "ImageCache could not read image" << reader.fileName() << ":" << reader.errorString();
+        return QImage();
+    }
+
+    cachePath.dir().mkpath(QStringLiteral("."));
+    loadedImage.save(cachePath.filePath(), format, 100);
+
+    return loadedImage;
+}
+
+QImage ImageCache::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
+{
+    QUrl image(id);
+    QImageReader imageReader(image.toLocalFile());
+    QSize imageSize(imageReader.size());
+    QImage result;
+
+    // Early exit here, with no sourceSize, scaled-up sourceSize, or bad source image
+    if ((requestedSize.width() <= 0 && requestedSize.height() <= 0) ||
+        imageSize.isEmpty() ||
+        requestedSize.height() >= imageSize.height() ||
+        requestedSize.width() >= imageSize.width()) {
+        // We're only interested in scaling down, not up.
+        result = imageReader.read();
+        *size = result.size();
+        return result;
+    }
+
+    auto cachePath = imagePath(image);
+    QSize finalSize;
+
+    if (needsUpdate(image, cachePath, imageSize, requestedSize, finalSize)) {
+        if (finalSize.isEmpty()) {
+            finalSize = calculateSize(imageSize, requestedSize);
+        }
+        result = loadAndCacheImage(imageReader, cachePath, finalSize);
+    } else {
+        result = QImage(cachePath.filePath());
+    }
+
+    *size = result.size();
+    return result;
+}

=== added file 'plugins/ImageCache/ImageCache.h'
--- plugins/ImageCache/ImageCache.h	1970-01-01 00:00:00 +0000
+++ plugins/ImageCache/ImageCache.h	2016-09-22 07:47:54 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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/>.
+ */
+
+#pragma once
+
+#include <QFileInfo>
+#include <QImageReader>
+#include <QQuickImageProvider>
+#include <QSize>
+
+/**
+ * This class accepts an id formulated like a URL. So you'd use something like:
+ *
+ * Image {
+ *    source: "image://unity8imagecache/file:///usr/share/..."
+ * }
+ *
+ * Right now, we only support file:/// URLs. We do accept some flags though:
+ *
+ * ?name=NAME
+ *   - This will use NAME as the cache lookup key instead of the provided URL.
+ *
+ * We don't do any cleaning of old cached files yet.  So you may want to always
+ * provide a name to avoid leaving lots of files around.
+ */
+
+class ImageCache: public QQuickImageProvider
+{
+public:
+    ImageCache();
+
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
+
+private:
+    static QString imageCacheRoot();
+    static QFileInfo imagePath(const QUrl &image);
+    static bool needsUpdate(const QUrl &image, const QFileInfo &cachePath, const QSize &imageSize, const QSize &requestedSize, QSize &finalSize);
+    static QSize calculateSize(const QSize &imageSize, const QSize &requestedSize);
+    static QImage loadAndCacheImage(QImageReader &reader, const QFileInfo &cachePath, const QSize &finalSize);
+};

=== added file 'plugins/ImageCache/plugin.cpp'
--- plugins/ImageCache/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/ImageCache/plugin.cpp	2016-09-22 07:47:54 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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 <QQmlEngine>
+
+#include "ImageCache.h"
+#include "plugin.h"
+
+#include <QtQml>
+
+void ImageCachePlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("ImageCache"));
+
+    qmlRegisterTypeNotAvailable(uri, 0, 1, "__ImageCacheIgnoreMe",
+                                QStringLiteral("Ignore this: QML plugins must contain at least one type"));
+}
+
+void ImageCachePlugin::initializeEngine(QQmlEngine* engine, const char* uri)
+{
+    Q_ASSERT(uri == QLatin1String("ImageCache"));
+
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+
+    engine->addImageProvider("unity8imagecache", new ImageCache);
+}

=== added file 'plugins/ImageCache/plugin.h'
--- plugins/ImageCache/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/ImageCache/plugin.h	2016-09-22 07:47:54 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QQmlExtensionPlugin>
+
+class QQmlEngine;
+
+class ImageCachePlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char* uri) override;
+    void initializeEngine(QQmlEngine* engine, const char* uri) override;
+};

=== added file 'plugins/ImageCache/qmldir'
--- plugins/ImageCache/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/ImageCache/qmldir	2016-09-22 07:47:54 +0000
@@ -0,0 +1,2 @@
+module ImageCache
+plugin ImageCache-qml

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-03-02 02:37:37 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-09-22 07:47:54 +0000
@@ -78,11 +78,6 @@
     return true;
 }
 
-bool Greeter::lockHint () const
-{
-    return false;
-}
-
 QString Greeter::selectUserHint() const
 {
     return QLatin1String("");

=== modified file 'plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-09-22 07:47:54 +0000
@@ -45,7 +45,6 @@
 
     Q_PROPERTY(QString hostname READ hostname CONSTANT)
     Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
-    Q_PROPERTY(bool locked READ lockHint CONSTANT)
 
     Q_ENUMS(PromptType MessageType)
 
@@ -68,7 +67,6 @@
     bool hideUsersHint() const;
     bool showManualLoginHint() const;
     bool showRemoteLoginHint() const;
-    bool lockHint () const;
     bool hasGuestAccountHint() const;
     QString selectUserHint() const;
     bool selectGuestHint() const;

=== modified file 'plugins/LightDM/SessionsModel.cpp'
--- plugins/LightDM/SessionsModel.cpp	2016-06-14 20:08:43 +0000
+++ plugins/LightDM/SessionsModel.cpp	2016-09-22 07:47:54 +0000
@@ -47,15 +47,15 @@
     Q_EMIT iconSearchDirectoriesChanged();
 }
 
-QUrl SessionsModel::iconUrl(const QString sessionName) const
+QUrl SessionsModel::iconUrl(const QString sessionKey) 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";
+            "/custom_" + sessionKey  + "_badge.png";
         QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +
-            "/" + sessionName  + "_badge.png";
+            "/" + sessionKey  + "_badge.png";
 
         QFile customIconFile(customIconUrl);
         QFile iconFile(iconUrl);
@@ -63,29 +63,35 @@
             return QUrl(customIconUrl);
         } else if (iconFile.exists()) {
             return QUrl(iconUrl);
-        } else{
+        } else {
             // Search the legacy way
             QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";
-            if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {
+            bool iconFound = false;
+            if (sessionKey == "ubuntu" || sessionKey == "ubuntu-2d") {
                 path += "ubuntu_badge.png";
+                iconFound = true;
             } else if(
-                        sessionName == "gnome-classic" ||
-                        sessionName == "gnome-flashback-compiz" ||
-                        sessionName == "gnome-flashback-metacity" ||
-                        sessionName == "gnome-shell" ||
-                        sessionName == "gnome-wayland" ||
-                        sessionName == "gnome"
+                        sessionKey == "gnome-classic" ||
+                        sessionKey == "gnome-flashback-compiz" ||
+                        sessionKey == "gnome-flashback-metacity" ||
+                        sessionKey == "gnome-shell" ||
+                        sessionKey == "gnome-wayland" ||
+                        sessionKey == "gnome"
                     ){
                 path += "gnome_badge.png";
-            } else if (sessionName == "plasma") {
+                iconFound = true;
+            } else if (sessionKey == "plasma") {
                 path += "kde_badge.png";
-            } else if (sessionName == "xterm") {
+                iconFound = true;
+            } else if (sessionKey == "xterm") {
                 path += "recovery_console_badge.png";
-            } else if (sessionName == "remote-login") {
+                iconFound = true;
+            } else if (sessionKey == "remote-login") {
                 path += "remote_login_help.png";
+                iconFound = true;
             }
 
-            if (QFile(path).exists()) {
+            if (QFile(path).exists() && iconFound) {
                 return path;
             }
         }
@@ -99,7 +105,7 @@
 {
     switch (role) {
         case SessionsModel::IconRole:
-            return iconUrl(m_model->data(index, Qt::DisplayRole).toString());
+            return iconUrl(m_model->data(index, QLightDM::SessionsModel::KeyRole).toString());
         default:
             return m_model->data(index, role);
     }

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2015-11-18 03:52:01 +0000
+++ plugins/LightDM/plugin.cpp	2016-09-22 07:47:54 +0000
@@ -82,7 +82,7 @@
     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"));
+    qmlRegisterUncreatableType<QLightDM::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"));

=== modified file 'plugins/SessionBroadcast/SessionBroadcast.cpp'
--- plugins/SessionBroadcast/SessionBroadcast.cpp	2016-04-19 20:36:29 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.cpp	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,12 +12,12 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
  */
 
 #include "SessionBroadcast.h"
 #include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
 
 #include <glib.h>
 
@@ -27,13 +27,39 @@
     m_username = QString::fromUtf8(g_get_user_name());
 
     auto connection = QDBusConnection::SM_BUSNAME();
-
-    connection.connect(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
-                       QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
-                       QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
-                       QStringLiteral("ShowHome"),
-                       this,
-                       SLOT(onShowHome(const QString &)));
+    auto interface = connection.interface();
+    interface->startService(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"));
+
+    m_broadcaster = new QDBusInterface(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
+                                       QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
+                                       QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
+                                       connection, this);
+
+    connect(m_broadcaster, SIGNAL(StartUrl(const QString &, const QString &)),
+            this, SLOT(onStartUrl(const QString &, const QString &)));
+
+    connect(m_broadcaster, SIGNAL(ShowHome(const QString &)),
+            this, SLOT(onShowHome(const QString &)));
+}
+
+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
+{
+    m_broadcaster->asyncCall(QStringLiteral("RequestUrlStart"), username, url);
+}
+
+void SessionBroadcast::requestHomeShown(const QString &username)
+{
+    m_broadcaster->asyncCall(QStringLiteral("RequestHomeShown"), username);
+}
+
+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
+{
+    // Since this signal is just used for testing, we don't *really* care if
+    // username matches, but just in case we do eventually use the signal, we
+    // should only listen to our own requests.
+    if (username == m_username) {
+        Q_EMIT startUrl(url);
+    }
 }
 
 void SessionBroadcast::onShowHome(const QString &username)

=== modified file 'plugins/SessionBroadcast/SessionBroadcast.h'
--- plugins/SessionBroadcast/SessionBroadcast.h	2016-04-06 19:03:42 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.h	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Terry <[e-mail]>
  */
 
 #ifndef UNITY_SESSIONBROADCAST_H
@@ -31,14 +29,23 @@
 public:
     explicit SessionBroadcast(QObject *parent = 0);
 
+    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
+    Q_INVOKABLE void requestHomeShown(const QString &username);
+
 Q_SIGNALS:
+    // This signal isn't actually used by the shell
+    // (unity-greeter-session-broadcast handles launching an app for us), but
+    // it's useful for testing the plugin.
+    void startUrl(const QString &url);
     void showHome();
 
 private Q_SLOTS:
+    void onStartUrl(const QString &username, const QString &url);
     void onShowHome(const QString &username);
 
 private:
     QString m_username;
+    QDBusInterface *m_broadcaster;
 };
 
 #endif

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2016-06-02 09:32:33 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2016-09-22 07:47:54 +0000
@@ -12,5 +12,7 @@
 add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
 
 qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
-
+pkg_check_modules(DDLADAPTER REQUIRED udm-common)
+add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
+target_link_libraries(DownloadDaemonListener ${DDLADAPTER_LIBRARIES})
 add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp'
--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp	2015-08-19 13:56:21 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 - Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -78,6 +78,7 @@
         connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
         connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
         connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
+        connect(m_adaptor, &DownloadTrackerAdaptor::processing, this, &DownloadTracker::processing);
     }
     // FIXME find a better way of determining if the service is ready
     Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h'
--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h	2015-11-20 15:01:39 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 - Canonical Ltd.
+ * Copyright (C) 2013-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License, as
@@ -54,6 +54,7 @@
     void error(const QString &error);
     void finished(const QString &path);
     void paused(bool success);
+    void processing(const QString &path);
     void progress(qulonglong received, qulonglong total);
     void resumed(bool success);
     void started(bool success);

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp'
--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp	2013-07-24 14:18:23 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp	2016-09-22 07:47:54 +0000
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
+ * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h'
--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h	2015-09-14 09:11:08 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h	2016-09-22 07:47:54 +0000
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
+ * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
  *
- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef DOWNLOADTRACKERADAPTOR_H_1374434371
-#define DOWNLOADTRACKERADAPTOR_H_1374434371
+#ifndef DOWNLOADTRACKERADAPTOR_H
+#define DOWNLOADTRACKERADAPTOR_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -36,6 +36,22 @@
 
     ~DownloadTrackerAdaptor();
 
+    Q_PROPERTY(QString ClickPackage READ clickPackage)
+    inline QString clickPackage() const
+    { return qvariant_cast< QString >(property("ClickPackage")); }
+
+    Q_PROPERTY(QString DestinationApp READ destinationApp)
+    inline QString destinationApp() const
+    { return qvariant_cast< QString >(property("DestinationApp")); }
+
+    Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
+    inline bool showInIndicator() const
+    { return qvariant_cast< bool >(property("ShowInIndicator")); }
+
+    Q_PROPERTY(QString Title READ title)
+    inline QString title() const
+    { return qvariant_cast< QString >(property("Title")); }
+
 public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> allowGSMDownload(bool allowed)
     {
@@ -50,6 +66,24 @@
         return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
     }
 
+    inline QDBusPendingReply<> collected()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("collected"), argumentList);
+    }
+
+    inline QDBusPendingReply<QString> filePath()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("filePath"), argumentList);
+    }
+
+    inline QDBusPendingReply<StringMap> headers()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("headers"), argumentList);
+    }
+
     inline QDBusPendingReply<bool> isGSMDownloadAllowed()
     {
         QList<QVariant> argumentList;
@@ -80,6 +114,27 @@
         return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
     }
 
+    inline QDBusPendingReply<> setDestinationDir(const QString &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QStringLiteral("setDestinationDir"), argumentList);
+    }
+
+    inline QDBusPendingReply<> setHeaders(StringMap headers)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(headers);
+        return asyncCallWithArgumentList(QStringLiteral("setHeaders"), argumentList);
+    }
+
+    inline QDBusPendingReply<> setMetadata(const QVariantMap &data)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(data);
+        return asyncCallWithArgumentList(QStringLiteral("setMetadata"), argumentList);
+    }
+
     inline QDBusPendingReply<> setThrottle(qulonglong speed)
     {
         QList<QVariant> argumentList;
@@ -93,6 +148,12 @@
         return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
     }
 
+    inline QDBusPendingReply<int> state()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("state"), argumentList);
+    }
+
     inline QDBusPendingReply<qulonglong> throttle()
     {
         QList<QVariant> argumentList;
@@ -106,10 +167,16 @@
     }
 
 Q_SIGNALS: // SIGNALS
+    void authError(AuthErrorStruct error);
     void canceled(bool success);
     void error(const QString &error);
     void finished(const QString &path);
+    void hashError(HashErrorStruct error);
+    void httpError(HttpErrorStruct error);
+    void networkError(NetworkErrorStruct error);
     void paused(bool success);
+    void processError(ProcessErrorStruct error);
+    void processing(const QString &path);
     void progress(qulonglong received, qulonglong total);
     void resumed(bool success);
     void started(bool success);

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h'
--- plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h	2013-07-24 14:18:23 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public
@@ -19,10 +19,7 @@
 #ifndef DOWNLOADER_LIB_APP_METATYPES_H
 #define DOWNLOADER_LIB_APP_METATYPES_H
 
-#include <QMap>
-
-typedef QMap<QString, QString> StringMap;
-
-Q_DECLARE_METATYPE(StringMap)
+// Just include the system file so we're always up to date.
+#include <ubuntu/download_manager/metatypes.h>
 
 #endif // METATYPES_H

=== modified file 'plugins/Ubuntu/Gestures/TouchGestureArea.h'
--- plugins/Ubuntu/Gestures/TouchGestureArea.h	2016-08-08 14:15:49 +0000
+++ plugins/Ubuntu/Gestures/TouchGestureArea.h	2016-09-22 07:47:54 +0000
@@ -76,7 +76,7 @@
         return *this;
     }
 
-    bool operator=(const GestureTouchPoint& rhs) const {
+    bool operator==(const GestureTouchPoint& rhs) const {
         if (&rhs == this) return true;
         return m_id == rhs.m_id &&
                 m_pressed == rhs.m_pressed &&
@@ -84,7 +84,7 @@
                 m_y == rhs.m_y &&
                 m_dragging == rhs.m_dragging;
     }
-    bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
+    bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }
 
     void setPos(const QPointF &pos);
 

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2016-06-27 18:45:27 +0000
+++ plugins/Utils/CMakeLists.txt	2016-09-22 07:47:54 +0000
@@ -29,6 +29,7 @@
     inputeventgenerator.cpp
     deviceconfigparser.cpp
     globalfunctions.cpp
+    URLDispatcher.cpp
     plugin.cpp
     )
 

=== added file 'plugins/Utils/URLDispatcher.cpp'
--- plugins/Utils/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/URLDispatcher.cpp	2016-09-22 07:47:54 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "URLDispatcher.h"
+
+#include <QDBusConnection>
+
+class URLDispatcherInterface : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
+
+public:
+    explicit URLDispatcherInterface(URLDispatcher *parent);
+
+    Q_SCRIPTABLE void DispatchURL(const QString &url, const QString &package);
+};
+
+URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
+  : QObject(parent)
+{
+}
+
+void URLDispatcherInterface::DispatchURL(const QString &url, const QString &package)
+{
+    Q_UNUSED(package);
+    Q_EMIT static_cast<URLDispatcher *>(parent())->urlRequested(url);
+}
+
+URLDispatcher::URLDispatcher(QObject *parent)
+  : QObject(parent)
+  , m_dispatcher(nullptr)
+{
+}
+
+bool URLDispatcher::active() const
+{
+    return m_dispatcher != nullptr;
+}
+
+void URLDispatcher::setActive(bool value)
+{
+    if (value == active())
+        return;
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+
+    if (value) {
+        URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
+        connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),
+                                  dispatcher,
+                                  QDBusConnection::ExportScriptableContents);
+        connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));
+        m_dispatcher = dispatcher;
+    } else {
+        connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));
+        delete m_dispatcher;
+        m_dispatcher = nullptr;
+    }
+
+    Q_EMIT activeChanged();
+}
+
+#include "URLDispatcher.moc"

=== added file 'plugins/Utils/URLDispatcher.h'
--- plugins/Utils/URLDispatcher.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/URLDispatcher.h	2016-09-22 07:47:54 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_URLDISPATCHER_H
+#define UNITY_URLDISPATCHER_H
+
+#include <QObject>
+#include <QString>
+
+// This class manages our url-dispatcher interception.  We intercept
+// url-dispatcher because rather than spawning the handler for the URL
+// in our own session, we want to notify the user session to do it for us
+// (and start an unlock in the process).
+
+class URLDispatcher : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+
+public:
+    explicit URLDispatcher(QObject *parent=0);
+
+    bool active() const;
+    void setActive(bool active);
+
+Q_SIGNALS:
+    void urlRequested(const QString &url);
+    void activeChanged();
+
+private:
+    QObject *m_dispatcher;
+};
+
+#endif

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
+++ plugins/Utils/plugin.cpp	2016-09-22 07:47:54 +0000
@@ -38,6 +38,7 @@
 #include "inputeventgenerator.h"
 #include "deviceconfigparser.h"
 #include "globalfunctions.h"
+#include "URLDispatcher.h"
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -80,4 +81,5 @@
     qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
     qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
     qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
+    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
 }

=== modified file 'plugins/Utils/windowstatestorage.cpp'
--- plugins/Utils/windowstatestorage.cpp	2016-08-08 14:15:49 +0000
+++ plugins/Utils/windowstatestorage.cpp	2016-09-22 07:47:54 +0000
@@ -76,7 +76,7 @@
     return (WindowState)query.value(QStringLiteral("state")).toInt();
 }
 
-void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
+void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
 {
     const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
             .arg(sanitiseString(windowId))
@@ -92,7 +92,7 @@
 {
     const QString queryString = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values ('%1', '%2');")
             .arg(sanitiseString(appId))
-            .arg((int)stage);
+            .arg(stage);
 
     saveValue(queryString);
 }
@@ -123,7 +123,7 @@
     }
 }
 
-QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const
+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const
 {
     QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
             .arg(sanitiseString(windowId));
@@ -133,7 +133,8 @@
     if (!query.first()) {
         return defaultValue;
     }
-    return QRect(query.value(QStringLiteral("x")).toInt(), query.value(QStringLiteral("y")).toInt(), query.value(QStringLiteral("width")).toInt(), query.value(QStringLiteral("height")).toInt());
+    return QRect(query.value(QStringLiteral("x")).toInt(), query.value(QStringLiteral("y")).toInt(),
+                 query.value(QStringLiteral("width")).toInt(), query.value(QStringLiteral("height")).toInt());
 }
 
 void WindowStateStorage::initdb()

=== modified file 'plugins/Utils/windowstatestorage.h'
--- plugins/Utils/windowstatestorage.h	2016-06-20 14:26:27 +0000
+++ plugins/Utils/windowstatestorage.h	2016-09-22 07:47:54 +0000
@@ -32,7 +32,12 @@
         WindowStateMaximizedLeft = 1 << 4,
         WindowStateMaximizedRight = 1 << 5,
         WindowStateMaximizedHorizontally = 1 << 6,
-        WindowStateMaximizedVertically = 1 << 7
+        WindowStateMaximizedVertically = 1 << 7,
+        WindowStateMaximizedTopLeft = 1 << 8,
+        WindowStateMaximizedTopRight = 1 << 9,
+        WindowStateMaximizedBottomLeft = 1 << 10,
+        WindowStateMaximizedBottomRight = 1 << 11,
+        WindowStateRestored = 1 << 12
     };
     Q_DECLARE_FLAGS(WindowStates, WindowState)
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
@@ -45,8 +50,8 @@
     Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
     Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;
 
-    Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect rect);
-    Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect defaultValue) const;
+    Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
+    Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;
 
     Q_INVOKABLE void saveStage(const QString &appId, int stage);
     Q_INVOKABLE int getStage(const QString &appId, int defaultValue) const;

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2016-08-31 11:56:09 +0000
+++ po/unity8.pot	2016-09-22 07:47:54 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the unity8 package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-31 11:56+0000\n"
+"POT-Creation-Date: 2016-09-22 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"
@@ -35,25 +35,6 @@
 msgid "Unpin shortcut"
 msgstr ""
 
-#: qml/Components/DelayedLockscreen.qml:50
-msgid "Device Locked"
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:65
-msgid "You have been locked out due to too many failed passphrase attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:66
-msgid "You have been locked out due to too many failed passcode attempts."
-msgstr ""
-
-#: qml/Components/DelayedLockscreen.qml:75
-#, qt-format
-msgid "Please wait %1 minute and then try again…"
-msgid_plural "Please wait %1 minutes and then try again…"
-msgstr[0] ""
-msgstr[1] ""
-
 #: qml/Components/Dialogs.qml:149
 msgctxt "Title: Lock/Log out dialog"
 msgid "Log out"
@@ -74,7 +55,8 @@
 msgstr ""
 
 #: qml/Components/Dialogs.qml:166 qml/Components/Dialogs.qml:222
-#: qml/Dash/DashPageHeader.qml:322 qml/Wizard/Pages/passcode-confirm.qml:32
+#: qml/Dash/DashPageHeader.qml:324 qml/Greeter/NarrowView.qml:232
+#: qml/Wizard/Pages/passcode-confirm.qml:32
 #: qml/Wizard/Pages/passcode-set.qml:32
 msgid "Cancel"
 msgstr ""
@@ -277,15 +259,15 @@
 msgid "Closes the current window."
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:239
+#: qml/Components/Lockscreen.qml:212 qml/Greeter/NarrowView.qml:252
 msgid "Return to Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:239
+#: qml/Components/Lockscreen.qml:212
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:271
+#: qml/Components/Lockscreen.qml:244
 msgid "OK"
 msgstr ""
 
@@ -329,55 +311,55 @@
 msgid "Preview Share Item"
 msgstr ""
 
-#: qml/Dash/DashPageHeader.qml:360
+#: qml/Dash/DashPageHeader.qml:362
 msgctxt "Button: Open the Ubuntu Store"
 msgid "Store"
 msgstr ""
 
-#: qml/Dash/DashPageHeader.qml:367
+#: qml/Dash/DashPageHeader.qml:369
 msgctxt "Button: Start a search in the current dash scope"
 msgid "Search"
 msgstr ""
 
-#: qml/Dash/DashPageHeader.qml:377
+#: qml/Dash/DashPageHeader.qml:379
 msgctxt "Button: Show the current dash scope settings"
 msgid "Settings"
 msgstr ""
 
-#: qml/Dash/DashPageHeader.qml:384
+#: qml/Dash/DashPageHeader.qml:386
 msgid "Remove from Favorites"
 msgstr ""
 
-#: qml/Dash/DashPageHeader.qml:384
+#: qml/Dash/DashPageHeader.qml:386
 msgid "Add to Favorites"
 msgstr ""
 
-#: qml/Dash/FiltersPopover.qml:60
+#: qml/Dash/FiltersPopover.qml:61
 msgid "Refine your results"
 msgstr ""
 
-#: qml/Dash/FiltersPopover.qml:69
+#: qml/Dash/FiltersPopover.qml:70
 msgid "Reset"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:585 qml/Dash/GenericScopeView.qml:780
+#: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782
 msgid "Show less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:585
+#: qml/Dash/GenericScopeView.qml:586
 msgid "Show all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:642
+#: qml/Dash/GenericScopeView.qml:643
 msgctxt "Label: Hint for dash search line edit"
 msgid "Search"
 msgstr ""
 
-#: qml/Dash/PageHeaderExtraPanel.qml:56
+#: qml/Dash/PageHeaderExtraPanel.qml:57
 msgid "Recent Searches"
 msgstr ""
 
-#: qml/Dash/PageHeaderExtraPanel.qml:67
+#: qml/Dash/PageHeaderExtraPanel.qml:68
 msgid "Clear All"
 msgstr ""
 
@@ -389,24 +371,24 @@
 msgid "Less..."
 msgstr ""
 
-#: qml/Dash/Previews/PreviewCommentInput.qml:68
-#: qml/Dash/Previews/PreviewRatingInput.qml:175
+#: qml/Dash/Previews/PreviewCommentInput.qml:83
+#: qml/Dash/Previews/PreviewRatingInput.qml:201
 msgid "Send"
 msgstr ""
 
-#: qml/Dash/Previews/PreviewRatingInput.qml:82
+#: qml/Dash/Previews/PreviewRatingInput.qml:108
 msgid "Rate this"
 msgstr ""
 
-#: qml/Dash/Previews/PreviewRatingInput.qml:157
+#: qml/Dash/Previews/PreviewRatingInput.qml:183
 msgid "Add a review"
 msgstr ""
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:55
+#: qml/Dash/PullToRefreshScopeStyle.qml:56
 msgid "Pull to refresh…"
 msgstr ""
 
-#: qml/Dash/PullToRefreshScopeStyle.qml:60
+#: qml/Dash/PullToRefreshScopeStyle.qml:61
 msgid "Release to refresh…"
 msgstr ""
 
@@ -414,15 +396,15 @@
 msgid "Enable location data"
 msgstr ""
 
-#: qml/Dash/ScopesList.qml:55
+#: qml/Dash/ScopesList.qml:57
 msgid "Manage"
 msgstr ""
 
-#: qml/Dash/ScopesList.qml:102
+#: qml/Dash/ScopesList.qml:104
 msgid "Home"
 msgstr ""
 
-#: qml/Dash/ScopesList.qml:103
+#: qml/Dash/ScopesList.qml:105
 msgid "Also installed"
 msgstr ""
 
@@ -436,79 +418,51 @@
 msgid "Unlock"
 msgstr ""
 
-#: qml/Greeter/Greeter.qml:561
+#: qml/Greeter/DelayedLockscreen.qml:43
+msgid "Device Locked"
+msgstr ""
+
+#: qml/Greeter/DelayedLockscreen.qml:58
+msgid "You have been locked out due to too many failed passphrase attempts."
+msgstr ""
+
+#: qml/Greeter/DelayedLockscreen.qml:59
+msgid "You have been locked out due to too many failed passcode attempts."
+msgstr ""
+
+#: qml/Greeter/DelayedLockscreen.qml:68
+#, qt-format
+msgid "Please wait %1 minute and then try again…"
+msgid_plural "Please wait %1 minutes and then try again…"
+msgstr[0] ""
+msgstr[1] ""
+
+#: qml/Greeter/Greeter.qml:596
 msgid "Try again"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:63
+#: qml/Greeter/LoginList.qml:70
 msgid "Passphrase"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:64
+#: qml/Greeter/LoginList.qml:71
 msgid "Passcode"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:87
+#: qml/Greeter/LoginList.qml:98
 msgid "Retry"
 msgstr ""
 
-#: qml/Greeter/LoginList.qml:88
+#: qml/Greeter/LoginList.qml:99
 msgid "Log In"
 msgstr ""
 
-#: qml/Greeter/NarrowView.qml:55
-msgid "Sorry, incorrect passphrase."
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:56
-msgid "Sorry, incorrect passcode."
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:57
-msgid "This will be your last attempt."
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:59
-msgid ""
-"If passphrase is entered incorrectly, your phone will conduct a factory "
-"reset and all personal data will be deleted."
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:60
-msgid ""
-"If passcode is entered incorrectly, your phone will conduct a factory reset "
-"and all personal data will be deleted."
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:129
-#, qt-format
-msgid "Enter %1"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:130
-msgid "Enter passphrase"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:131
-msgid "Enter passcode"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:135
-#, qt-format
-msgid "Sorry, incorrect %1"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:136
-msgid "Sorry, incorrect passphrase"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:137
-msgctxt "passphrase"
-msgid "Please re-enter"
-msgstr ""
-
-#: qml/Greeter/NarrowView.qml:138
-msgid "Sorry, incorrect passcode"
+#: qml/Greeter/NarrowView.qml:252
+msgid "Emergency"
+msgstr ""
+
+#: qml/Greeter/SessionsList.qml:122
+msgid "Select desktop environment"
 msgstr ""
 
 #: qml/Notifications/NotificationMenuItemFactory.qml:124
@@ -627,51 +581,51 @@
 msgid "Back"
 msgstr ""
 
-#: qml/Wizard/Pages/10-welcome.qml:27
+#: qml/Wizard/Pages/10-welcome.qml:28
 msgid "Language"
 msgstr ""
 
-#: qml/Wizard/Pages/10-welcome.qml:172 qml/Wizard/Pages/20-keyboard.qml:151
-#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/40-location.qml:271
-#: qml/Wizard/Pages/50-timezone.qml:270 qml/Wizard/Pages/60-account.qml:65
-#: qml/Wizard/Pages/70-passwd-type.qml:144
+#: qml/Wizard/Pages/10-welcome.qml:173 qml/Wizard/Pages/20-keyboard.qml:152
+#: qml/Wizard/Pages/30-wifi.qml:207 qml/Wizard/Pages/40-location.qml:271
+#: qml/Wizard/Pages/50-timezone.qml:271 qml/Wizard/Pages/60-account.qml:65
+#: qml/Wizard/Pages/70-passwd-type.qml:145
 #: qml/Wizard/Pages/75-report-check.qml:84
-#: qml/Wizard/Pages/passcode-desktop.qml:141
-#: qml/Wizard/Pages/password-set.qml:141
+#: qml/Wizard/Pages/passcode-desktop.qml:142
+#: qml/Wizard/Pages/password-set.qml:142
 msgid "Next"
 msgstr ""
 
-#: qml/Wizard/Pages/20-keyboard.qml:30
+#: qml/Wizard/Pages/20-keyboard.qml:31
 msgid "Select Keyboard"
 msgstr ""
 
-#: qml/Wizard/Pages/20-keyboard.qml:70
+#: qml/Wizard/Pages/20-keyboard.qml:71
 msgid "Keyboard language"
 msgstr ""
 
-#: qml/Wizard/Pages/20-keyboard.qml:92
+#: qml/Wizard/Pages/20-keyboard.qml:93
 msgid "Keyboard layout"
 msgstr ""
 
-#: qml/Wizard/Pages/20-keyboard.qml:151 qml/Wizard/Pages/30-wifi.qml:206
-#: qml/Wizard/Pages/60-account.qml:65
-#: qml/Wizard/Pages/77-system-update.qml:152 qml/Wizard/Pages/sim.qml:101
+#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:207
+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/77-system-update.qml:152
+#: qml/Wizard/Pages/sim.qml:101
 msgid "Skip"
 msgstr ""
 
-#: qml/Wizard/Pages/30-wifi.qml:30
+#: qml/Wizard/Pages/30-wifi.qml:31
 msgid "Connect to Wi‑Fi"
 msgstr ""
 
-#: qml/Wizard/Pages/30-wifi.qml:131
+#: qml/Wizard/Pages/30-wifi.qml:132
 msgid "Connected"
 msgstr ""
 
-#: qml/Wizard/Pages/30-wifi.qml:164
+#: qml/Wizard/Pages/30-wifi.qml:165
 msgid "Available Wi-Fi networks"
 msgstr ""
 
-#: qml/Wizard/Pages/30-wifi.qml:165
+#: qml/Wizard/Pages/30-wifi.qml:166
 msgid "No available Wi-Fi networks"
 msgstr ""
 
@@ -707,11 +661,11 @@
 msgid "You can change it later in System Settings."
 msgstr ""
 
-#: qml/Wizard/Pages/50-timezone.qml:29
+#: qml/Wizard/Pages/50-timezone.qml:30
 msgid "Time Zone"
 msgstr ""
 
-#: qml/Wizard/Pages/50-timezone.qml:181
+#: qml/Wizard/Pages/50-timezone.qml:182
 msgid "Enter your city"
 msgstr ""
 
@@ -723,21 +677,21 @@
 msgid "Preferred Name"
 msgstr ""
 
-#: qml/Wizard/Pages/70-passwd-type.qml:39
+#: qml/Wizard/Pages/70-passwd-type.qml:40
 msgid "Lock Screen"
 msgstr ""
 
-#: qml/Wizard/Pages/70-passwd-type.qml:101
+#: qml/Wizard/Pages/70-passwd-type.qml:102
 msgctxt "Label: Type of security method"
 msgid "Create new password"
 msgstr ""
 
-#: qml/Wizard/Pages/70-passwd-type.qml:103
+#: qml/Wizard/Pages/70-passwd-type.qml:104
 msgctxt "Label: Type of security method"
 msgid "Create passcode (numbers only)"
 msgstr ""
 
-#: qml/Wizard/Pages/70-passwd-type.qml:105
+#: qml/Wizard/Pages/70-passwd-type.qml:106
 msgctxt "Label: Type of security method"
 msgid "No lock code"
 msgstr ""
@@ -830,7 +784,7 @@
 msgstr ""
 
 #: qml/Wizard/Pages/passcode-confirm.qml:43
-#: qml/Wizard/Pages/passcode-desktop.qml:96
+#: qml/Wizard/Pages/passcode-desktop.qml:97
 msgid "Confirm passcode"
 msgstr ""
 
@@ -843,28 +797,28 @@
 msgid "Please re-enter."
 msgstr ""
 
-#: qml/Wizard/Pages/passcode-desktop.qml:30
+#: qml/Wizard/Pages/passcode-desktop.qml:31
 msgid "Lock Screen Passcode"
 msgstr ""
 
-#: qml/Wizard/Pages/passcode-desktop.qml:60
+#: qml/Wizard/Pages/passcode-desktop.qml:61
 msgid "Enter 4 numbers to setup your passcode"
 msgstr ""
 
-#: qml/Wizard/Pages/passcode-desktop.qml:76
+#: qml/Wizard/Pages/passcode-desktop.qml:77
 #: qml/Wizard/Pages/passcode-set.qml:54
 msgid "Choose passcode"
 msgstr ""
 
-#: qml/Wizard/Pages/passcode-desktop.qml:126
+#: qml/Wizard/Pages/passcode-desktop.qml:127
 msgid "Passcode too short"
 msgstr ""
 
-#: qml/Wizard/Pages/passcode-desktop.qml:128
+#: qml/Wizard/Pages/passcode-desktop.qml:129
 msgid "Passcodes match"
 msgstr ""
 
-#: qml/Wizard/Pages/passcode-desktop.qml:130
+#: qml/Wizard/Pages/passcode-desktop.qml:131
 msgid "Passcodes do not match"
 msgstr ""
 
@@ -872,19 +826,19 @@
 msgid "Passcode must be 4 characters long"
 msgstr ""
 
-#: qml/Wizard/Pages/password-set.qml:30
+#: qml/Wizard/Pages/password-set.qml:31
 msgid "Lock Screen Password"
 msgstr ""
 
-#: qml/Wizard/Pages/password-set.qml:61
+#: qml/Wizard/Pages/password-set.qml:62
 msgid "Enter at least 8 characters"
 msgstr ""
 
-#: qml/Wizard/Pages/password-set.qml:73
+#: qml/Wizard/Pages/password-set.qml:74
 msgid "Choose password"
 msgstr ""
 
-#: qml/Wizard/Pages/password-set.qml:103
+#: qml/Wizard/Pages/password-set.qml:104
 msgid "Confirm password"
 msgstr ""
 

=== modified file 'qml/Components/Carousel.qml'
--- qml/Components/Carousel.qml	2015-09-14 07:47:24 +0000
+++ qml/Components/Carousel.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import "carousel.js" as CarouselJS
+import "."
 
 /*! The Carousel component presents the items of a model in a carousel view. It's similar to a
     cover flow. But it stops at it's boundaries (therefore no PathView is used).
@@ -141,8 +142,6 @@
 
         boundsBehavior: Flickable.DragOverBounds
         cacheBuffer: carousel.cacheBuffer
-        flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default
-        maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
         orientation: ListView.Horizontal
 
         function getXFromContinuousIndex(index) {

=== added file 'qml/Components/Flickable.qml'
--- qml/Components/Flickable.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/Flickable.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4 as QtQuick
+import Ubuntu.Components 1.3
+import "flickableUtils.js" as FlickableUtilsJS
+
+QtQuick.Flickable {
+    flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
+    maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
+}
\ No newline at end of file

=== modified file 'qml/Components/FloatingFlickable.qml'
--- qml/Components/FloatingFlickable.qml	2016-01-11 16:57:07 +0000
+++ qml/Components/FloatingFlickable.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
+import "."
 
 /*
     A Flickable that can be put in front of the item to be flicked and

=== added file 'qml/Components/GridView.qml'
--- qml/Components/GridView.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/GridView.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4 as QtQuick
+import Ubuntu.Components 1.3
+import "flickableUtils.js" as FlickableUtilsJS
+
+QtQuick.GridView {
+    flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
+    maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
+}
\ No newline at end of file

=== added file 'qml/Components/ListView.qml'
--- qml/Components/ListView.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/ListView.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4 as QtQuick
+import Ubuntu.Components 1.3
+import "flickableUtils.js" as FlickableUtilsJS
+
+QtQuick.ListView {
+    flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
+    maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
+}
\ No newline at end of file

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2016-05-26 20:59:30 +0000
+++ qml/Components/Lockscreen.qml	2016-09-22 07:47:54 +0000
@@ -41,9 +41,6 @@
     // The text to be displayed in case the login failed
     property string errorText: ""
 
-    // If > 0, a forced delay is happening
-    property int delayMinutes: 0
-
     // Set those to a value greater 0 to restrict the pin length.
     // If both are unset, the Lockscreen will show a confirm button and allow typing any length of pin before
     // confirming. If minPinLength is set to a value > 0, the confirm button will only become active when the
@@ -91,14 +88,6 @@
         popup.z = Number.MAX_VALUE
     }
 
-    function showText(text) {
-        // Programmatically enters the given text into the lockscreen
-        if (pinPadLoader.item) {
-            pinPadLoader.item.showText(text);
-            pinPadLoader.waiting = true;
-        }
-    }
-
     Rectangle {
         // In case background fails to load
         id: backgroundBackup
@@ -107,17 +96,13 @@
         visible: root.background.toString() !== ""
     }
 
-    Image {
+    Wallpaper {
         id: backgroundImage
         objectName: "lockscreenBackground"
         anchors {
             fill: parent
         }
-        // Limit how much memory we'll reserve for this image
-        sourceSize.height: height
-        sourceSize.width: width
         source: root.required ? root.background : ""
-        fillMode: Image.PreserveAspectCrop
     }
 
     // This is to
@@ -141,8 +126,6 @@
         source: {
             if (resetting || !root.required) {
                 return ""
-            } else if (root.delayMinutes > 0) {
-                return "DelayedLockscreen.qml"
             } else if (root.alphaNumeric) {
                 return "PassphraseLockscreen.qml"
             } else {
@@ -199,16 +182,6 @@
         }
         Binding {
             target: pinPadLoader.item
-            property: "alphaNumeric"
-            value: root.alphaNumeric
-        }
-        Binding {
-            target: pinPadLoader.item
-            property: "delayMinutes"
-            value: root.delayMinutes
-        }
-        Binding {
-            target: pinPadLoader.item
             property: "showCancelButton"
             value: root.showCancelButton
         }

=== modified file 'qml/Components/PanelState/PanelState.qml'
--- qml/Components/PanelState/PanelState.qml	2016-05-30 19:52:41 +0000
+++ qml/Components/PanelState/PanelState.qml	2016-09-22 07:47:54 +0000
@@ -30,5 +30,4 @@
     signal closeClicked()
     signal minimizeClicked()
     signal restoreClicked()
-    signal focusMaximizedApp()
 }

=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml	2016-05-25 19:25:51 +0000
+++ qml/Components/PassphraseLockscreen.qml	2016-09-22 07:47:54 +0000
@@ -43,10 +43,6 @@
         }
     }
 
-    function showText(text) {
-        pinentryField.text = text;
-    }
-
     Column {
         id: shakeContainer
         anchors.horizontalCenter: parent.horizontalCenter

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2016-05-25 19:25:51 +0000
+++ qml/Components/PinLockscreen.qml	2016-09-22 07:47:54 +0000
@@ -46,10 +46,6 @@
         }
     }
 
-    function showText(text) {
-        pinentryField.text = text;
-    }
-
     Keys.onPressed: {
         if (pinentryField.text.length == root.maxPinLength)
             return;

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2016-01-13 09:00:03 +0000
+++ qml/Components/ResponsiveGridView.qml	2016-09-22 07:47:54 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import "."
 
 /*
    Essentially a GridView

=== modified file 'qml/Components/VolumeControl.qml'
--- qml/Components/VolumeControl.qml	2016-01-05 06:09:56 +0000
+++ qml/Components/VolumeControl.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import QMenuModel 0.1 as QMenuModel
 import GlobalShortcut 1.0
+import Unity.Platform 1.0
 
 Item {
     id: root
@@ -27,8 +28,6 @@
     readonly property int stepUp: 1
     readonly property int stepDown: -1
 
-    property var indicators // passed from Shell.qml
-
     GlobalShortcut {
         id: muteShortcut
         shortcut: Qt.Key_VolumeMute
@@ -42,7 +41,8 @@
         objectPath: "/com/canonical/indicator/sound"
 
         property variant actionObject: action("volume")
-        property variant muteActionObject: indicators.indicatorsModel.profile === "desktop" ? action("mute") : action("silent-mode")
+        // temporary workaround for lp:1623166
+        property variant muteActionObject: Platform.isPC ? action("mute") : action("silent-mode")
     }
 
     function volumeUp() {

=== added file 'qml/Components/Wallpaper.qml'
--- qml/Components/Wallpaper.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/Wallpaper.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013-2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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 QtQuick.Window 2.2
+import Ubuntu.Components 1.3
+
+Item {
+    id: root
+    property url source
+
+    CrossFadeImage {
+        anchors.fill: parent
+        fillMode: Image.PreserveAspectCrop
+
+        // Limit how much memory we reserve and avoid reloading when item size
+        // changes or is rotated by specifying sourceSize.
+        //
+        // FIXME: If the source image has a portrait aspect ratio, we should swap
+        // sourceSize.width and sourceSize.height to prevent blurriness from double
+        // scaling.  We could easily do that with a tiny image loader to check
+        // the aspect ratio first, but when we change sourceSize, we lose all
+        // the benefits of CrossFadeImage.  So we need to fix that component
+        // first to gracefully handle sourceSize changes (LP: #1599203).
+        readonly property int maxSize: Math.max(Screen.width, Screen.height)
+        sourceSize.width: 0
+        sourceSize.height: maxSize
+
+        source: root.source
+    }
+}

=== modified file 'qml/Components/WallpaperResolver.qml'
--- qml/Components/WallpaperResolver.qml	2016-05-18 13:38:27 +0000
+++ qml/Components/WallpaperResolver.qml	2016-09-22 07:47:54 +0000
@@ -15,49 +15,35 @@
  */
 
 import QtQuick 2.4
-import AccountsService 0.1
-import GSettings 1.0
 import Ubuntu.Components 1.3
 
-/*
-    Defines the background URL based on several factors, such as:
-        - default, fallback, background
-        - Background set in AccountSettings, if any
-        - Background set in GSettings, if any
- */
-QtObject {
-    // Users should set their UI width here.
-    property real width
-
-    property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
-                                                                         : "../graphics/phone_background.jpg")
-
-    // That's the property users of this component are going to consume.
-    readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
-                                    : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
-
-    // This is a dummy image to detect if the custom AS set wallpaper loads successfully.
-    property var _asImageTester: Image {
-        id: asImageTester
-        source: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
-        height: 0
-        width: 0
-        sourceSize.height: 0
-        sourceSize.width: 0
-    }
-
-    // This is a dummy image to detect if the custom GSettings set wallpaper loads successfully.
-    property var _gsImageTester: Image {
-        id: gsImageTester
-        source: backgroundSettings.pictureUri && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : ""
-        height: 0
-        width: 0
-        sourceSize.height: 0
-        sourceSize.width: 0
-    }
-
-    property var _gsettings: GSettings {
-        id: backgroundSettings
-        schema.id: "org.gnome.desktop.background"
+Item {
+    id: root
+
+    // Provide a list of wallpapers to resolve here, preferred ones first
+    property var candidates: []
+
+    readonly property url background: {
+        for (var i = 0; i < repeater.count; i++) {
+            if (repeater.itemAt(i).status === Image.Ready)
+                return candidates[i];
+        }
+        if (i > 0) {
+            return candidates[i - 1]; // last item is last resort
+        } else {
+            return "";
+        }
+    }
+
+    Repeater {
+        id: repeater
+        model: root.candidates
+        delegate: Image {
+            source: modelData
+            height: 0
+            width: 0
+            sourceSize.height: 0
+            sourceSize.width: 0
+        }
     }
 }

=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2016-06-20 10:31:44 +0000
+++ qml/Components/WindowControlButtons.qml	2016-09-22 07:47:54 +0000
@@ -19,13 +19,12 @@
 
 Row {
     id: root
-    spacing: overlayShown ? units.gu(2) : units.gu(1)
+    spacing: overlayShown ? units.gu(2) : windowIsMaximized ? 0 : units.gu(1)
     Behavior on spacing {
         UbuntuNumberAnimation {}
     }
 
     // to be set from outside
-    property Item target
     property bool active: false
     property bool windowIsMaximized: false
     property bool closeButtonShown: true
@@ -49,13 +48,14 @@
 
         Rectangle {
             anchors.fill: parent
+            anchors.margins: windowIsMaximized ? units.dp(3) : 0
             radius: height / 2
             color: theme.palette.normal.negative
             visible: parent.containsMouse && !overlayShown
         }
         Icon {
             anchors.fill: parent
-            anchors.margins: units.dp(3)
+            anchors.margins: windowIsMaximized ? units.dp(6) : units.dp(3)
             source: "graphics/window-close.svg"
             color: root.active ? "white" : UbuntuColors.slate
         }
@@ -71,13 +71,14 @@
 
         Rectangle {
             anchors.fill: parent
+            anchors.margins: windowIsMaximized ? units.dp(3) : 0
             radius: height / 2
             color: root.active ? UbuntuColors.graphite : UbuntuColors.ash
             visible: parent.containsMouse && !overlayShown
         }
         Icon {
             anchors.fill: parent
-            anchors.margins: units.dp(3)
+            anchors.margins: windowIsMaximized ? units.dp(6) : units.dp(3)
             source: "graphics/window-minimize.svg"
             color: root.active ? "white" : UbuntuColors.slate
         }
@@ -103,13 +104,14 @@
 
         Rectangle {
             anchors.fill: parent
+            anchors.margins: windowIsMaximized ? units.dp(3) : 0
             radius: height / 2
             color: root.active ? UbuntuColors.graphite : UbuntuColors.ash
             visible: parent.containsMouse && !overlayShown
         }
         Icon {
             anchors.fill: parent
-            anchors.margins: units.dp(3)
+            anchors.margins: windowIsMaximized ? units.dp(6) : units.dp(3)
             source: root.windowIsMaximized ? "graphics/window-window.svg" : "graphics/window-maximize.svg"
             color: root.active ? "white" : UbuntuColors.slate
         }

=== modified file 'qml/Components/ZoomableImage.qml'
--- qml/Components/ZoomableImage.qml	2016-01-22 23:16:50 +0000
+++ qml/Components/ZoomableImage.qml	2016-09-22 07:47:54 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import "../Components"
+import "."
 
 /*! \brief Zoomable for image.
 

=== added file 'qml/Components/flickableUtils.js'
--- qml/Components/flickableUtils.js	1970-01-01 00:00:00 +0000
+++ qml/Components/flickableUtils.js	2016-09-22 07:47:54 +0000
@@ -0,0 +1,28 @@
+/*
+ * 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/>.
+ */
+
+.pragma library
+
+/* TODO the "8" is is DEFAULT_GRID_UNIT_PX, we use it to normalize the values with the current grid unit size.
+   Add a way to fetch this default grid unit px value from UITK. */
+
+function getFlickDeceleration(gridUnit) {
+    return 1500 * gridUnit / 8;
+}
+
+function getMaximumFlickVelocity(gridUnit) {
+    return 2500 * gridUnit / 8;
+}
\ No newline at end of file

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2016-07-25 10:12:34 +0000
+++ qml/Dash/CardTool.qml	2016-09-22 07:47:54 +0000
@@ -71,7 +71,17 @@
     // Not readonly because gets overwritten from GenericScopeView in some cases
     property string artShapeStyle: categoryLayout === "carousel" ? "shadow" : "inset"
 
-    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, cardTool.artShapeStyle, cardTool.categoryLayout);
+    // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone
+    // we are doing unneeded calls to getCardComponent with artShapeStyle and categoryLayout being empty
+    // Check when we move to newer Qts on the phone if we still need this
+    readonly property bool askForCardComponent: cardTool.template !== undefined &&
+                                                cardTool.components !== undefined &&
+                                                cardTool.artShapeStyle !== "" &&
+                                                cardTool.categoryLayout !== ""
+
+    property var cardComponent: askForCardComponent
+                                    ? CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false, cardTool.artShapeStyle, cardTool.categoryLayout)
+                                    : undefined
 
     // FIXME: Saviq
     // Only way for the card below to actually be laid out completely.
@@ -213,7 +223,9 @@
             "attributes": attributesModel.model,
             "socialActions": socialActionsModel.model
         }
-        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, cardTool.artShapeStyle, cardTool.categoryLayout);
+        sourceComponent: askForCardComponent
+                            ? CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true, cardTool.artShapeStyle, cardTool.categoryLayout)
+                            : undefined
         onLoaded: {
             item.objectName = "cardToolCard";
             item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });

=== modified file 'qml/Dash/DashBackground.qml'
--- qml/Dash/DashBackground.qml	2015-12-18 09:05:24 +0000
+++ qml/Dash/DashBackground.qml	2016-09-22 07:47:54 +0000
@@ -16,10 +16,10 @@
 
 import QtQuick 2.4
 import QtQuick.Window 2.2
-import Ubuntu.Thumbnailer 0.1
+import ImageCache 0.1
 
 Image {
-    source: "image://thumbnailer/" + Qt.resolvedUrl("graphics/paper.png")
+    source: "image://unity8imagecache/" + Qt.resolvedUrl("graphics/paper.png")
     fillMode: Image.PreserveAspectCrop
     horizontalAlignment: Image.AlignRight
     verticalAlignment: Image.AlignTop

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2016-03-29 03:47:39 +0000
+++ qml/Dash/DashContent.qml	2016-09-22 07:47:54 +0000
@@ -112,8 +112,6 @@
             anchors.fill: parent
             orientation: ListView.Horizontal
             boundsBehavior: Flickable.DragAndOvershootBounds
-            flickDeceleration: units.gu(625)
-            maximumFlickVelocity: width * 5
             snapMode: ListView.SnapOneItem
             highlightMoveDuration: 250
             highlightRangeMode: ListView.StrictlyEnforceRange

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2016-03-29 03:47:39 +0000
+++ qml/Dash/DashNavigation.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Dash 0.1
+import "../Components"
 
 Item {
     id: root

=== modified file 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/DashPageHeader.qml	2016-08-03 15:51:32 +0000
+++ qml/Dash/DashPageHeader.qml	2016-09-22 07:47:54 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Components.ListItems 1.3
+import Utils 0.1
 import "../Components"
 
 Item {
@@ -25,6 +26,7 @@
     objectName: "pageHeader"
     implicitHeight: headerContainer.height + signatureLineHeight
     readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0
+    readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color)
 
     property int activeFiltersCount: 0
     property bool scopeHasFilters: false

=== modified file 'qml/Dash/FiltersPopover.qml'
--- qml/Dash/FiltersPopover.qml	2016-03-14 08:54:07 +0000
+++ qml/Dash/FiltersPopover.qml	2016-09-22 07:47:54 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import "Filters" as Filters
+import "../Components"
 
 Popover {
     id: root

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-08-11 06:23:42 +0000
+++ qml/Dash/GenericScopeView.qml	2016-09-22 07:47:54 +0000
@@ -23,6 +23,7 @@
 import Dash 0.1
 import "../Components"
 import "../Components/ListItems" as ListItems
+import "Previews/PreviewSingleton"
 
 FocusScope {
     id: scopeView
@@ -722,6 +723,7 @@
             target: categoryView
 
             readonly property real contentY: categoryView.contentY - categoryView.originY
+            readonly property real headerDividerLuminance: categoryView.pageHeader.headerDividerLuminance
             y: -contentY - units.gu(5)
 
             onRefresh: {
@@ -787,6 +789,17 @@
             color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
+        Image {
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+            }
+            fillMode: Image.Stretch
+            source: "graphics/dash_divider_top_darkgrad.png"
+            z: -1
+        }
+
         Connections {
             target: floatingSeeLess.companionTo ? categoryView : null
             onContentYChanged: floatingSeeLess.updateVisibility();
@@ -824,6 +837,9 @@
         }
 
         function closeSubPage() {
+            if (subPage == "preview") {
+                PreviewSingleton.widgetExtraData = new Object();
+            }
             open = false;
         }
 

=== modified file 'qml/Dash/PageHeaderExtraPanel.qml'
--- qml/Dash/PageHeaderExtraPanel.qml	2016-05-05 18:16:20 +0000
+++ qml/Dash/PageHeaderExtraPanel.qml	2016-09-22 07:47:54 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import "Filters" as Filters
+import "../Components"
 
 Item {
     id: root
@@ -123,6 +124,7 @@
                     }
                     text: query
                     color: "#888888"
+                    elide: Text.ElideRight
                 }
 
                 divider.visible: index != recentSearchesRepeater.count - 1 || (scope && scope.hasNavigation) || primaryFilter.active

=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
--- qml/Dash/Previews/PreviewCommentInput.qml	2015-09-14 07:47:24 +0000
+++ qml/Dash/Previews/PreviewCommentInput.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import "../../Components"
+import "PreviewSingleton"
 
 /*! \brief Preview widget for commenting.
 
@@ -35,6 +36,20 @@
         triggered(root.widgetId, "commented", data);
     }
 
+    property alias commentText: commentTextArea.text
+
+    onCommentTextChanged: storeCommentState()
+    onWidgetIdChanged: restoreCommentState()
+
+    function storeCommentState() {
+        PreviewSingleton.widgetExtraData[widgetId] = commentText;
+    }
+
+    function restoreCommentState() {
+        if (!PreviewSingleton.widgetExtraData[widgetId]) return;
+        if (PreviewSingleton.widgetExtraData[widgetId] != "") commentText = PreviewSingleton.widgetExtraData[widgetId];
+    }
+
     TextArea {
         id: commentTextArea
         objectName: "commentTextArea"

=== modified file 'qml/Dash/Previews/PreviewInlineVideo.qml'
--- qml/Dash/Previews/PreviewInlineVideo.qml	2016-06-01 16:05:12 +0000
+++ qml/Dash/Previews/PreviewInlineVideo.qml	2016-09-22 07:47:54 +0000
@@ -18,6 +18,7 @@
 import QtMultimedia 5.0
 import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1
+import "PreviewSingleton"
 import "../../Components"
 import "../../Components/MediaServices"
 
@@ -36,9 +37,35 @@
     orientationLock: services.fullscreen
 
     property alias rootItem: services.rootItem
+    readonly property string widgetExtraDataKey: services.source.toString()
+
+    onWidgetExtraDataKeyChanged: {
+        root.restorePlaybackState();
+    }
+
+    function seek() {
+        services.mediaPlayer.seek(services.initialPosition);
+        services.initialPosition = -1;
+    }
+
+    function storePlaybackState() {
+        if ((services.mediaPlayer.duration - services.mediaPlayer.position) < 1000) {
+            // we're at the end of the video
+            PreviewSingleton.widgetExtraData[widgetExtraDataKey] = 0;
+        } else {
+            PreviewSingleton.widgetExtraData[widgetExtraDataKey] = services.mediaPlayer.position;
+        }
+    }
+
+    function restorePlaybackState() {
+        if (PreviewSingleton.widgetExtraData[widgetExtraDataKey] > 0) {
+            services.initialPosition = PreviewSingleton.widgetExtraData[widgetExtraDataKey];
+        }
+    }
 
     MediaServices {
         id: services
+        objectName: "services"
         width: parent.width
 
         actions: sharingAction
@@ -47,8 +74,28 @@
         fullscreen: false
         maximumEmbeddedHeight: rootItem.height / 2
 
+        property int initialPosition: -1
+
+        readonly property var mediaPlayer: footer.mediaPlayer
+        readonly property url source: mediaPlayer.source
+        readonly property int position: mediaPlayer.position
+
         onClose: fullscreen = false
 
+        onPositionChanged: {
+            if (mediaPlayer.playbackState === MediaPlayer.StoppedState) return;
+            root.storePlaybackState();
+        }
+
+        Connections {
+            target: services.mediaPlayer
+            ignoreUnknownSignals: true
+            onPlaying: {
+                // at the first playback of the file, do a seek()
+                if (services.initialPosition > 0) root.seek();
+            }
+        }
+
         Action {
             id: sharingAction
             iconName: "share"

=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
--- qml/Dash/Previews/PreviewProgress.qml	2015-07-15 15:07:19 +0000
+++ qml/Dash/Previews/PreviewProgress.qml	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-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
@@ -59,6 +59,10 @@
                 }
             }
 
+            onProcessing: {
+                progressBar.indeterminate = true;
+            }
+
             onFinished: {
                 root.triggered(widgetId, "finished", widgetData)
             }

=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml	2016-05-20 14:21:59 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import "../../Components"
+import "PreviewSingleton"
 
 /*! \brief Preview widget for rating.
 
@@ -53,6 +54,31 @@
     property alias ratingValue: rating.value
     property alias reviewText: reviewTextArea.text
 
+    onRatingValueChanged: storeRatingState()
+    onReviewTextChanged: storeTextState()
+    onWidgetIdChanged: restoreReviewState()
+
+    function initializeWidgetExtraData() {
+        if (typeof(PreviewSingleton.widgetExtraData[widgetId]) == "undefined") PreviewSingleton.widgetExtraData[widgetId] = [];
+    }
+
+    function storeRatingState() {
+        initializeWidgetExtraData();
+        PreviewSingleton.widgetExtraData[widgetId][0] = ratingValue;
+    }
+
+    function storeTextState() {
+        initializeWidgetExtraData();
+        PreviewSingleton.widgetExtraData[widgetId][1] = reviewText;
+    }
+
+    function restoreReviewState() {
+        if (!PreviewSingleton.widgetExtraData[widgetId]) return;
+        if (PreviewSingleton.widgetExtraData[widgetId][0] > 0) ratingValue = PreviewSingleton.widgetExtraData[widgetId][0];
+        if (typeof(PreviewSingleton.widgetExtraData[widgetId][1]) != "undefined" &&
+            PreviewSingleton.widgetExtraData[widgetId][1] != "") reviewText = PreviewSingleton.widgetExtraData[widgetId][1];
+    }
+
     function submit() {
         // checks rating-input requirements
         if (((widgetData["required"] === "both" ||
@@ -89,7 +115,7 @@
             size: 5
             height: units.gu(4)
             onValueChanged: {
-                if (widgetData["visible"] === "rating") root.submit();
+                if (widgetData && widgetData["visible"] === "rating") root.submit();
             }
 
             property var urlIconEmpty: widgetData["rating-icon-empty"] || "image://theme/non-starred"

=== added directory 'qml/Dash/Previews/PreviewSingleton'
=== added file 'qml/Dash/Previews/PreviewSingleton/PreviewSingleton.qml'
--- qml/Dash/Previews/PreviewSingleton/PreviewSingleton.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewSingleton/PreviewSingleton.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,22 @@
+/*
+ * 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/>.
+ */
+
+pragma Singleton
+import QtQuick 2.4
+
+QtObject {
+    property var widgetExtraData: new Object();
+}
\ No newline at end of file

=== added file 'qml/Dash/Previews/PreviewSingleton/qmldir'
--- qml/Dash/Previews/PreviewSingleton/qmldir	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewSingleton/qmldir	2016-09-22 07:47:54 +0000
@@ -0,0 +1,1 @@
+singleton PreviewSingleton 1.0 PreviewSingleton.qml

=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
--- qml/Dash/PullToRefreshScopeStyle.qml	2016-06-07 19:22:13 +0000
+++ qml/Dash/PullToRefreshScopeStyle.qml	2016-09-22 07:47:54 +0000
@@ -48,6 +48,7 @@
         anchors.horizontalCenter: parent.horizontalCenter
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
+        color: styledItem.headerDividerLuminance < 0.3 ? UbuntuColors.porcelain : UbuntuColors.jet
         states: [
             State {
                 name: "pulling"

=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2015-07-15 15:07:19 +0000
+++ qml/Dash/ScopeListView.qml	2016-09-22 07:47:54 +0000
@@ -15,11 +15,13 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Dash 0.1
+import "../Components/flickableUtils.js" as FlickableUtilsJS
 
 ListViewWithPageHeader {
-    maximumFlickVelocity: height * 10
-    flickDeceleration: height * 2
+    flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
+    maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
     // 1073741823 is s^30 -1. A quite big number so that you have "infinite" cache, but not so
     // big so that if you add if with itself you're outside the 2^31 int range
     cacheBuffer: 1073741823

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2016-06-08 13:13:43 +0000
+++ qml/Dash/ScopesList.qml	2016-09-22 07:47:54 +0000
@@ -15,7 +15,9 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Dash 0.1
+import "../Components"
 
 Item {
     id: root

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2015-07-15 15:07:19 +0000
+++ qml/Dash/ScopesListCategory.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Dash 0.1
+import "../Components"
 import "../Components/ListItems" as ListItems
 
 Item {

=== renamed file 'qml/Components/Circle.qml' => 'qml/Greeter/Circle.qml'
--- qml/Components/Circle.qml	2015-07-15 15:07:19 +0000
+++ qml/Greeter/Circle.qml	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,42 @@
 
 import QtQuick 2.4
 
-Rectangle {
-    antialiasing: true
-    radius: width / 2
- }
+Canvas {
+    id: root
+    property color color
+    property real circleScale
+    property var centerCircle
+
+    onColorChanged: requestPaint()
+    onCircleScaleChanged: requestPaint()
+    onCenterCircleChanged: requestPaint()
+
+    onPaint: {
+        if (circleScale <= 0) {
+            return;
+        }
+
+        var ctx = getContext("2d");
+
+        // draw big circle
+        ctx.save();
+        ctx.fillStyle = color;
+        ctx.beginPath();
+        ctx.arc(width / 2, height / 2, circleScale * width / 2, 0, 2 * Math.PI, false);
+        ctx.fill();
+        ctx.restore();
+
+        // chop out inner infographics circle
+        if (centerCircle) {
+            var circleMiddle = mapFromItem(centerCircle,
+                                           centerCircle.width / 2,
+                                           centerCircle.height / 2);
+            ctx.save();
+            ctx.globalCompositeOperation = "destination-out";
+            ctx.beginPath();
+            ctx.arc(circleMiddle.x, circleMiddle.y, centerCircle.width / 2, 0, 2 * Math.PI, false);
+            ctx.fill();
+            ctx.restore();
+        }
+    }
+}

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2015-07-15 15:07:19 +0000
+++ qml/Greeter/Clock.qml	2016-09-22 07:47:54 +0000
@@ -73,7 +73,6 @@
             anchors.horizontalCenter: parent.horizontalCenter
             font.pixelSize: units.gu(7.5)
             color: "white"
-            opacity: 0.5
             text: Qt.formatTime(clock.currentDate)
             font.weight: Font.Light
         }
@@ -85,7 +84,6 @@
             anchors.horizontalCenter: parent.horizontalCenter
             fontSize: "medium"
             color: "white"
-            opacity: 0.5
             text: Qt.formatDate(clock.currentDate, Qt.DefaultLocaleLongDate)
             font.weight: Font.Light
         }

=== modified file 'qml/Greeter/CoverPage.qml'
--- qml/Greeter/CoverPage.qml	2016-06-18 22:37:48 +0000
+++ qml/Greeter/CoverPage.qml	2016-09-22 07:47:54 +0000
@@ -25,13 +25,14 @@
     property real dragHandleLeftMargin
     property real launcherOffset
     property alias background: greeterBackground.source
+    property alias hasCustomBackground: backgroundShade.visible
     property real backgroundTopMargin
     property var infographicModel
     property bool draggable: true
 
     property alias infographics: infographics
 
-    readonly property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
+    readonly property real showProgress: MathUtils.clamp((width - Math.abs(x + launcherOffset)) / width, 0, 1)
 
     signal tease()
     signal clicked()
@@ -82,24 +83,23 @@
         color: "black"
     }
 
-    CrossFadeImage {
+    Wallpaper {
         id: greeterBackground
         objectName: "greeterBackground"
         anchors {
             fill: parent
             topMargin: root.backgroundTopMargin
         }
-        fillMode: Image.PreserveAspectCrop
-        // Limit how much memory we'll reserve for this image
-        sourceSize.height: height
-        sourceSize.width: width
     }
 
     // Darkens wallpaper so that we can read text on it and see infographic
     Rectangle {
+        id: backgroundShade
+        objectName: "backgroundShade"
         anchors.fill: parent
         color: "black"
         opacity: 0.4
+        visible: false
     }
 
     Infographics {

=== renamed file 'qml/Components/DelayedLockscreen.qml' => 'qml/Greeter/DelayedLockscreen.qml'
--- qml/Components/DelayedLockscreen.qml	2016-05-25 19:25:51 +0000
+++ qml/Greeter/DelayedLockscreen.qml	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import "../Components"
 
 Item {
     id: root
@@ -24,12 +23,6 @@
     property int delayMinutes
     property bool alphaNumeric
 
-    signal entered(string passphrase) // unused
-    signal cancel() // unused
-
-    function clear(playAnimation) {}
-    function showText(text) {}
-
     Column {
         anchors.left: parent.left
         anchors.right: parent.right
@@ -46,7 +39,7 @@
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.Wrap
             fontSize: "x-large"
-            color: "#f3f3e7"
+            color: "white"
             text: i18n.tr("Device Locked")
         }
 
@@ -60,7 +53,7 @@
             anchors.right: parent.right
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.Wrap
-            color: "#f3f3e7"
+            color: "white"
             text: alphaNumeric ?
                   i18n.tr("You have been locked out due to too many failed passphrase attempts.") :
                   i18n.tr("You have been locked out due to too many failed passcode attempts.")
@@ -71,7 +64,7 @@
             anchors.right: parent.right
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.Wrap
-            color: "#f3f3e7"
+            color: "white"
             text: i18n.tr("Please wait %1 minute and then try again…",
                           "Please wait %1 minutes and then try again…",
                           root.delayMinutes).arg(root.delayMinutes)
@@ -83,10 +76,8 @@
         }
 
         Icon {
-            // It would be nice to use a less network-specific name,
-            // but this is the only lock icon we have.
-            name: "network-secure"
-            color: "#f3f3e7"
+            name: "lock"
+            color: "white"
             height: units.gu(4)
             width: units.gu(4)
             anchors.horizontalCenter: parent.horizontalCenter

=== modified file 'qml/Greeter/FullLightDMImpl.qml'
--- qml/Greeter/FullLightDMImpl.qml	2015-11-09 15:30:25 +0000
+++ qml/Greeter/FullLightDMImpl.qml	2016-09-22 07:47:54 +0000
@@ -22,6 +22,8 @@
 
     property var greeter: LightDM.Greeter
     property var infographic: LightDM.Infographic
+    property var sessions: LightDM.Sessions
+    property var sessionRoles: LightDM.SessionRoles
     property var users: LightDM.Users
     property var userRoles: LightDM.UserRoles
 

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-07-19 19:11:20 +0000
+++ qml/Greeter/Greeter.qml	2016-09-22 07:47:54 +0000
@@ -34,6 +34,7 @@
     property real dragHandleLeftMargin: 0
 
     property url background
+    property bool hasCustomBackground
 
     // How far to offset the top greeter layer during a launcher left-drag
     property real launcherOffset
@@ -72,9 +73,12 @@
         }
         forcedUnlock = false;
         if (required) {
+            if (loader.item) {
+                loader.item.reset(true /* forceShow */);
+            }
             // Normally loader.onLoaded will select a user, but if we're
             // already shown, do it manually.
-            d.selectUser(d.currentIndex, true);
+            d.selectUser(d.currentIndex, false);
         }
 
         // Even though we may already be shown, we want to call show() for its
@@ -105,8 +109,8 @@
         }
     }
 
-    // Notify that the user has explicitly requested the given app through unity8 GUI.
-    function notifyUserRequestedApp(appId) {
+    // Notify that the user has explicitly requested an app
+    function notifyUserRequestedApp() {
         if (!active) {
             return;
         }
@@ -132,6 +136,22 @@
         return d.startUnlock(true /* toTheRight */);
     }
 
+    function sessionToStart() {
+        for (var i = 0; i < LightDMService.sessions.count; i++) {
+            var session = LightDMService.sessions.data(i,
+                LightDMService.sessionRoles.KeyRole);
+            if (loader.item.sessionToStart === session) {
+                return session;
+            }
+        }
+
+        if (loader.item.sessionToStart === LightDMService.greeter.defaultSession) {
+            return LightDMService.greeter.defaultSession;
+        } else {
+            return "ubuntu"; // The default / fallback
+        }
+    }
+
     QtObject {
         id: d
 
@@ -178,7 +198,7 @@
                 return;
             d.waiting = true;
             if (reset) {
-                loader.item.reset();
+                loader.item.reset(false /* forceShow */);
             }
             currentIndex = index;
             var user = LightDMService.users.data(index, LightDMService.userRoles.NameRole);
@@ -197,7 +217,7 @@
 
         function login() {
             d.waiting = true;
-            if (LightDMService.greeter.startSessionSync()) {
+            if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
                 sessionStarted();
                 hideView();
             } else if (loader.item) {
@@ -222,6 +242,29 @@
                 }
             }
         }
+
+        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) {
+            if (loader.item) {
+                loader.item.reset(false /* forceShow */);
+                loader.item.showErrorMessage(msg);
+            }
+            showPromptMessage(msg, true);
+        }
     }
 
     onLauncherOffsetChanged: {
@@ -395,6 +438,12 @@
 
         Binding {
             target: loader.item
+            property: "hasCustomBackground"
+            value: root.hasCustomBackground
+        }
+
+        Binding {
+            target: loader.item
             property: "locked"
             value: root.locked
         }
@@ -436,20 +485,7 @@
         onShowGreeter: root.forceShow()
         onHideGreeter: root.forcedUnlock = true
 
-        onShowMessage: {
-            // 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);
-            }
-        }
+        onShowMessage: d.showPromptMessage(text, isError)
 
         onShowPrompt: {
             if (loader.item) {
@@ -557,10 +593,8 @@
             if (!d.secureFingerprint) {
                 d.startUnlock(false /* toTheRight */); // use normal login instead
             }
-            if (loader.item) {
-                var msg = d.secureFingerprint ? i18n.tr("Try again") : "";
-                loader.item.showErrorMessage(msg);
-            }
+            var msg = d.secureFingerprint ? i18n.tr("Try again") : "";
+            d.showFingerprintMessage(msg);
         }
 
         Component.onCompleted: restartOperation()
@@ -578,8 +612,10 @@
                 return;
             }
             console.log("Identified user by fingerprint:", result);
-            if (loader.item)
+            if (loader.item) {
+                loader.item.enabled = false;
                 loader.item.notifyAuthenticationSucceeded(true /* showFakePassword */);
+            }
             if (root.active)
                 root.forcedUnlock = true;
         }

=== modified file 'qml/Greeter/GreeterPrompt.qml'
--- qml/Greeter/GreeterPrompt.qml	2016-07-08 13:25:40 +0000
+++ qml/Greeter/GreeterPrompt.qml	2016-09-22 07:47:54 +0000
@@ -38,6 +38,16 @@
         d.enabled = true;
     }
 
+    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
+        }
+    }
+
     StyledItem {
         id: d
 
@@ -50,6 +60,12 @@
                                                                  : 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 {
@@ -70,19 +86,36 @@
         }
     }
 
-    AbstractButton {
+    Rectangle {
         id: promptButton
         objectName: "promptButton"
         anchors.fill: parent
         visible: !root.isPrompt
 
-        onClicked: {
+        function triggered() {
             if (d.enabled) {
                 d.enabled = false;
                 root.clicked();
             }
         }
 
+        Rectangle {
+            height: parent.height;
+            width: parent.width
+            color: "transparent"
+            border {
+                color: d.textColor
+                width: units.dp(1)
+            }
+        }
+
+        Keys.onReturnPressed: triggered();
+        Keys.onEnterPressed: triggered();
+        MouseArea {
+            anchors.fill: parent
+            onClicked: parent.triggered();
+        }
+
         Label {
             anchors.centerIn: parent
             color: d.textColor
@@ -142,15 +175,13 @@
             }
         }
 
-        onAccepted: {
-            if (d.enabled)
-                respond();
-        }
+        onAccepted: respond()
 
         function respond() {
-            d.enabled = false;
-            fakeLabel.text = displayText;
-            root.responded(text);
+            if (d.enabled) {
+                d.enabled = false;
+                root.responded(text);
+            }
         }
 
         Keys.onEscapePressed: {

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2016-02-02 22:07:04 +0000
+++ qml/Greeter/Infographics.qml	2016-09-22 07:47:54 +0000
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import "../Components"
 import "Gradient.js" as Gradient
 import QtQuick 2.4
 import Ubuntu.Components 1.3
@@ -36,6 +35,13 @@
                               || circleChangeAnimTimer.running
     }
 
+    QtObject {
+        id: whiteTheme
+        property color main: "white"
+        property color start: "white"
+        property color end: "white"
+    }
+
     Connections {
         target: model
         ignoreUnknownSignals: model === undefined
@@ -142,9 +148,10 @@
                     width: dataCircle.width / divisor
                     height: dataCircle.height / divisor
                     opacity: 0.0
-                    scale: 0.0
+                    circleScale: 0.0
                     visible: modelData !== undefined
                     color: "transparent"
+                    centerCircle: dataCircle
 
                     SequentialAnimation {
                         id: pastCircleChangeAnim
@@ -160,7 +167,7 @@
                             }
                             PropertyAnimation {
                                 target: pastCircle
-                                property: "scale"
+                                property: "circleScale"
                                 to: modelData
                                 easing.type: Easing.OutCurve
                                 duration: circleChangeAnimTimer.interval * d.circleModifier
@@ -168,7 +175,7 @@
                             ColorAnimation {
                                 target: pastCircle
                                 property: "color"
-                                to: Gradient.threeColorByIndex(index, count, infographic.model.secondColor)
+                                to: Gradient.threeColorByIndex(index, count, whiteTheme)
                                 easing.type: Easing.OutCurve
                                 duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
@@ -202,9 +209,10 @@
                     width: dataCircle.width / divisor
                     height: dataCircle.height / divisor
                     opacity: 0.0
-                    scale: 0.0
+                    circleScale: 0.0
                     visible: modelData !== undefined
                     color: "transparent"
+                    centerCircle: dataCircle
 
                     SequentialAnimation {
                         id: presentCircleChangeAnim
@@ -221,7 +229,7 @@
                             }
                             PropertyAnimation {
                                 target: presentCircle
-                                property: "scale"
+                                property: "circleScale"
                                 to: modelData
                                 easing.type: Easing.OutCurve
                                 duration: circleChangeAnimTimer.interval * d.circleModifier
@@ -229,7 +237,7 @@
                             ColorAnimation {
                                 target: presentCircle
                                 property: "color"
-                                to: Gradient.threeColorByIndex(index, infographic.model.currentDay, infographic.model.firstColor)
+                                to: Gradient.threeColorByIndex(index, infographic.model.currentDay, whiteTheme)
                                 easing.type: Easing.OutCurve
                                 duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
@@ -239,15 +247,6 @@
             }
         }
 
-        Image {
-            id: backgroundCircle
-            objectName: "backgroundCircle"
-
-            anchors.fill: parent
-
-            source: "graphics/infographic_circle_back.png"
-        }
-
         Timer {
             id: dotShowAnimTimer
 
@@ -318,7 +317,7 @@
 
                 index: model.index
                 count: dots.count
-                radius: backgroundCircle.width / 2
+                radius: dataCircle.width / 2
                 halfSize: dot.width / 2
                 posOffset: radius / dot.width / 3
                 state: dot.state
@@ -327,7 +326,7 @@
                     id: dot
                     objectName: "dot" + index
 
-                    property real baseOpacity: 0.4
+                    property real baseOpacity: 1
 
                     width: units.dp(5) * parent.radius / 200
                     height: units.dp(5) * parent.radius / 200
@@ -363,10 +362,10 @@
             property alias hideAnim: decreaseOpacity
             property alias showAnim: increaseOpacity
 
-            property real baseOpacity: 0.6
+            property real baseOpacity: 1
             property real duration: dotShowAnimTimer.interval * 5
 
-            height: 0.7 * backgroundCircle.width
+            height: 0.7 * dataCircle.width
             width: notification.height
             anchors.centerIn: parent
 

=== modified file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2015-11-07 00:12:17 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	2016-09-22 07:47:54 +0000
@@ -22,7 +22,8 @@
 
     property var greeter: LightDM.Greeter
     property var infographic: LightDM.Infographic
+    property var sessions: LightDM.Sessions
+    property var sessionRoles: LightDM.SessionRoles
     property var users: LightDM.Users
     property var userRoles: LightDM.UserRoles
-
 }

=== modified file 'qml/Greeter/LightDMService.qml'
--- qml/Greeter/LightDMService.qml	2015-11-06 19:43:38 +0000
+++ qml/Greeter/LightDMService.qml	2016-09-22 07:47:54 +0000
@@ -27,6 +27,8 @@
 
     property var greeter: d.valid ? loader.item.greeter : null
     property var infographic: d.valid ? loader.item.infographic : 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
     property var userRoles: d.valid ? loader.item.userRoles : null
 

=== added file 'qml/Greeter/LoginAreaContainer.qml'
--- qml/Greeter/LoginAreaContainer.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/LoginAreaContainer.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,38 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    BorderImage {
+        anchors {
+            fill: parent
+            topMargin: -units.gu(1)
+            leftMargin: -units.gu(1.5)
+            rightMargin: -units.gu(1.5)
+            bottomMargin: -units.gu(1.5)
+        }
+        source: "../Stages/graphics/dropshadow2gu.sci"
+        opacity: 0.35
+    }
+
+    UbuntuShape {
+        anchors.fill: parent
+        aspect: UbuntuShape.Flat
+        backgroundColor: theme.palette.normal.raised
+    }
+}

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2016-06-27 18:32:47 +0000
+++ qml/Greeter/LoginList.qml	2016-09-22 07:47:54 +0000
@@ -18,6 +18,7 @@
 import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.3
 import "../Components"
+import "." 0.1
 
 StyledItem {
     id: root
@@ -28,16 +29,22 @@
     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 moveDuration: 200
+    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 responded(string response)
+    signal sessionChooserButtonClicked()
 
     function tryToUnlock() {
         if (wasPrompted) {
@@ -78,6 +85,10 @@
         root.resetAuthentication();
     }
 
+    function showFakePassword() {
+        passwordInput.showFakePassword();
+    }
+
     QtObject {
         id: d
 
@@ -114,30 +125,17 @@
         userList.currentIndex = currentIndex;
     }
 
-    BorderImage {
-        anchors {
-            fill: highlightItem
-            topMargin: -units.gu(1)
-            leftMargin: -units.gu(1.5)
-            rightMargin: -units.gu(1.5)
-            bottomMargin: -units.gu(1.5)
-        }
-        source: "../Stages/graphics/dropshadow2gu.sci"
-        opacity: 0.35
-    }
-
-    UbuntuShape {
+    LoginAreaContainer {
         id: highlightItem
+        objectName: "highlightItem"
         anchors {
             left: parent.left
             leftMargin: units.gu(2)
             right: parent.right
             rightMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
         }
+
         height: root.highlightedHeight
-        aspect: UbuntuShape.Flat
-        backgroundColor: theme.palette.normal.raised
     }
 
     ListView {
@@ -148,11 +146,10 @@
         anchors.leftMargin: units.gu(2)
         anchors.rightMargin: units.gu(2)
 
-        preferredHighlightBegin: userList.height / 2 - root.highlightedHeight / 2
-        preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
+        preferredHighlightBegin: highlightItem.y
+        preferredHighlightEnd: highlightItem.y
         highlightRangeMode: ListView.StrictlyEnforceRange
         highlightMoveDuration: root.moveDuration
-        flickDeceleration: 10000
         interactive: count > 1
 
         readonly property bool movingInternally: moveTimer.running || userList.moving
@@ -173,6 +170,7 @@
 
             readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
             readonly property int belowOffset: root.highlightedHeight - root.cellHeight
+            readonly property string userSession: session
             readonly property string username: name
 
             opacity: {
@@ -206,9 +204,22 @@
                     bottomMargin: -(units.gu(4) + (parent.belowHighlight ? parent.belowOffset : 0))
                 }
                 text: realName
-                color: userList.currentIndex !== index ? theme.palette.normal.raised : theme.palette.normal.raisedText
+                color: userList.currentIndex !== index ? theme.palette.normal.raised
+                                                       : theme.palette.normal.raisedText
 
                 Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }
+
+                Rectangle {
+                    id: activeIndicator
+                    anchors.horizontalCenter: parent.left
+                    anchors.horizontalCenterOffset: -units.gu(1)
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: userList.currentIndex !== index ? theme.palette.normal.raised
+                                                           : theme.palette.normal.focus
+                    visible: userList.count > 1 && loggedIn
+                    height: units.gu(0.5)
+                    width: height
+                }
             }
 
             MouseArea {
@@ -237,6 +248,67 @@
         }
     }
 
+    // Use an AbstractButton due to icon limitations with Button
+    AbstractButton {
+        id: sessionChooser
+        objectName: "sessionChooserButton"
+
+        readonly property alias icon: badge.source
+
+        visible: LightDMService.sessions.count > 1 &&
+            !LightDMService.users.data(userList.currentIndex, LightDMService.userRoles.LoggedInRole)
+
+        height: units.gu(3.5)
+        width: units.gu(3.5)
+
+        activeFocusOnTab: true
+        anchors {
+            right: highlightItem.right
+            rightMargin: units.gu(2)
+
+            top: highlightItem.top
+            topMargin: units.gu(1.5)
+        }
+
+        Rectangle {
+            id: badgeHighlight
+
+            anchors.fill: parent
+            visible: parent.activeFocus
+            color: "transparent"
+            border.color: theme.palette.normal.focus
+            border.width: units.dp(1)
+            radius: 3
+        }
+
+        Icon {
+            id: badge
+            anchors.fill: parent
+            anchors.margins: units.dp(3)
+            keyColor: "#ffffff" // icon providers give us white icons
+            color: theme.palette.normal.raisedSecondaryText
+            source: LightDMService.sessions.iconUrl(root.currentSession)
+        }
+
+        Keys.onReturnPressed: {
+            sessionChooserButtonClicked();
+            event.accepted = true;
+        }
+
+        onClicked: {
+            sessionChooserButtonClicked();
+        }
+
+        // Refresh the icon path if looking at different places at runtime
+        // this is mainly for testing
+        Connections {
+            target: LightDMService.sessions
+            onIconSearchDirectoriesChanged: {
+                badge.source = LightDMService.sessions.iconUrl(root.currentSession)
+            }
+        }
+    }
+
     FadingLabel {
         id: infoLabel
         objectName: "infoLabel"
@@ -271,6 +343,7 @@
         width: highlightItem.width - anchors.margins * 2
         opacity: userList.movingInternally ? 0 : 1
 
+        activeFocusOnTab: true
         isAlphanumeric: root.alphanumeric
 
         onClicked: root.tryToUnlock()
@@ -283,6 +356,7 @@
 
         WrongPasswordAnimation {
             id: wrongPasswordAnimation
+            objectName: "wrongPasswordAnimation"
             target: passwordInput
         }
     }

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2016-06-27 18:59:20 +0000
+++ qml/Greeter/NarrowView.qml	2016-09-22 07:47:54 +0000
@@ -15,7 +15,9 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Components 1.3
+import Ubuntu.Telephony 0.1 as Telephony
 import "../Components"
 
 FocusScope {
@@ -23,34 +25,40 @@
 
     property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
     property alias launcherOffset: coverPage.launcherOffset
-    property int currentIndex // unused
-    property alias delayMinutes: lockscreen.delayMinutes
+    property alias currentIndex: loginList.currentIndex
+    property alias delayMinutes: delayedLockscreen.delayMinutes
     property alias backgroundTopMargin: coverPage.backgroundTopMargin
     property url background
+    property bool hasCustomBackground
     property bool locked
-    property bool alphanumeric
-    property var userModel // unused
+    property alias alphanumeric: loginList.alphanumeric
+    property alias userModel: loginList.model
     property alias infographicModel: coverPage.infographicModel
+    property string sessionToStart
     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
 
-    signal selected(int index) // unused
+    // so that it can be replaced in tests with a mock object
+    property var inputMethod: Qt.inputMethod
+
+    signal selected(int index)
     signal responded(string response)
     signal tease()
     signal emergencyCall()
 
     function showMessage(html) {
-        // TODO
+        loginList.showMessage(html);
     }
 
     function showPrompt(text, isSecret, isDefaultPrompt) {
-        lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
-        lockscreen.maybeShow();
+        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.
         var title = lockscreen.alphaNumeric ?
                     i18n.tr("Sorry, incorrect passphrase.") :
                     i18n.tr("Sorry, incorrect passcode.");
@@ -59,6 +67,7 @@
                     i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
                     i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."));
         lockscreen.showInfoPopup(title, text);
+        */
     }
 
     function hide() {
@@ -67,27 +76,24 @@
     }
 
     function notifyAuthenticationSucceeded(showFakePassword) {
-        // When using an alternate log in mechanism like fingerprints, the
-        // design is it looks like the user entered a passcode.
-        if (!alphanumeric && showFakePassword) {
-            lockscreen.showText("...."); // actual text doesn't matter, we show bullets
+        if (showFakePassword) {
+            loginList.showFakePassword();
         }
     }
 
     function notifyAuthenticationFailed() {
-        lockscreen.customError = "";
-        lockscreen.clear(true);
+        loginList.showError();
     }
 
     function showErrorMessage(msg) {
         coverPage.showErrorMessage(msg);
-        lockscreen.customError = msg ? msg : " "; // avoid default message
-        lockscreen.clear(true);
     }
 
-    function reset() {
-        lockscreen.customError = "";
-        coverPage.show();
+    function reset(forceShow) {
+        loginList.reset();
+        if (forceShow) {
+            coverPage.show();
+        }
     }
 
     function tryToUnlock(toTheRight) {
@@ -109,48 +115,59 @@
         }
     }
 
-    Lockscreen {
+    Showable {
         id: lockscreen
         objectName: "lockscreen"
-
+        anchors.fill: parent
         shown: false
+
         showAnimation: StandardAnimation { property: "opacity"; to: 1 }
         hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
-        anchors.fill: parent
-        visible: required
-        enabled: !coverPage.shown
-        background: root.background
-        darkenBackground: 0.4
-        alphaNumeric: root.alphanumeric
-        minPinLength: 4
-        maxPinLength: 4
-
-        property string promptText
-        infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
-                  alphaNumeric ? i18n.tr("Enter passphrase") :
-                                 i18n.tr("Enter passcode")
-
-        property string customError
-        errorText: customError !== "" ? customError :
-                   promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
-                   alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
-                                  i18n.ctr("passphrase", "Please re-enter") :
-                                  i18n.tr("Sorry, incorrect passcode")
-
-        onEntered: root.responded(passphrase)
-        onCancel: coverPage.show()
-        onEmergencyCall: root.emergencyCall()
-
-        onEnabledChanged: {
-            if (enabled) {
-                lockscreen.forceActiveFocus();
-            }
-        }
-
-        onVisibleChanged: {
-            if (visible) {
-                lockscreen.forceActiveFocus();
-            }
+
+        Wallpaper {
+            id: lockscreenBackground
+            objectName: "lockscreenBackground"
+            anchors {
+                fill: parent
+                topMargin: root.backgroundTopMargin
+            }
+            source: root.background
+        }
+
+        // Darken background to match CoverPage
+        Rectangle {
+            objectName: "lockscreenShade"
+            anchors.fill: parent
+            color: "black"
+            opacity: root.hasCustomBackground ? 0.4 : 0
+        }
+
+        LoginList {
+            id: loginList
+            objectName: "loginList"
+
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                top: parent.top
+                bottom: parent.bottom
+            }
+            width: units.gu(40)
+            boxVerticalOffset: units.gu(14)
+            enabled: !coverPage.shown && visible
+            visible: !delayedLockscreen.visible
+
+            locked: root.locked
+
+            onSelected: if (enabled) root.selected(index)
+            onResponded: root.responded(response)
+        }
+
+        DelayedLockscreen {
+            id: delayedLockscreen
+            objectName: "delayedLockscreen"
+            anchors.fill: parent
+            visible: delayMinutes > 0
+            alphaNumeric: loginList.alphanumeric
         }
 
         function maybeShow() {
@@ -172,21 +189,16 @@
         height: parent.height
         width: parent.width
         background: root.background
+        hasCustomBackground: root.hasCustomBackground
         draggable: !root.waiting
         onTease: root.tease()
         onClicked: hide()
 
         onShowProgressChanged: {
             if (showProgress === 1) {
-                lockscreen.reset();
-            }
-
-            if (showProgress === 0) {
-                if (root.locked) {
-                    lockscreen.clear(false); // to reset focus if necessary
-                } else {
-                    root.responded("");
-                }
+                loginList.reset();
+            } else if (showProgress === 0) {
+                loginList.tryToUnlock();
             }
         }
 
@@ -198,4 +210,78 @@
             }
         }
     }
+
+    StyledItem {
+        id: bottomBar
+        visible: lockscreen.shown
+        height: units.gu(4)
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.bottom
+        anchors.topMargin: - height * (1 - coverPage.showProgress)
+                           - (inputMethod && inputMethod.visible ?
+                              inputMethod.keyboardRectangle.height : 0)
+
+        Rectangle {
+            color: UbuntuColors.porcelain // matches OSK background
+            anchors.fill: parent
+        }
+
+        Label {
+            text: i18n.tr("Cancel")
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(2)
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            verticalAlignment: Text.AlignVCenter
+            font.weight: Font.Light
+            fontSize: "small"
+            color: UbuntuColors.slate
+
+            AbstractButton {
+                anchors.fill: parent
+                anchors.leftMargin: -units.gu(2)
+                anchors.rightMargin: -units.gu(2)
+                onClicked: coverPage.show()
+            }
+        }
+
+        Label {
+            objectName: "emergencyCallLabel"
+            text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency")
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(2)
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            verticalAlignment: Text.AlignVCenter
+            font.weight: Font.Light
+            fontSize: "small"
+            color: UbuntuColors.slate
+            // TODO: uncomment once bug 1616538 is fixed
+            // visible: telepathyHelper.ready && telepathyHelper.emergencyCallsAvailable
+            enabled: visible
+
+            AbstractButton {
+                anchors.fill: parent
+                anchors.leftMargin: -units.gu(2)
+                anchors.rightMargin: -units.gu(2)
+                onClicked: root.emergencyCall()
+            }
+        }
+    }
+
+    // FIXME: It's difficult to keep something tied closely to the OSK (bug
+    //        1616163).  But as a hack to avoid the background peeking out,
+    //        we add an extra Rectangle that just serves to hide the background
+    //        during OSK animations.
+    Rectangle {
+        visible: bottomBar.visible
+        height: inputMethod && inputMethod.visible ?
+                inputMethod.keyboardRectangle.height : 0
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        color: UbuntuColors.porcelain
+    }
 }

=== added file 'qml/Greeter/SessionIcon.qml'
--- qml/Greeter/SessionIcon.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/SessionIcon.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+
+Image {
+    id: root
+
+    property color color
+    readonly property string fragColorShader:
+        "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform lowp vec4 color;
+            uniform lowp float qt_Opacity;
+
+            void main()
+            {
+                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
+                gl_FragColor = color * sourceColor.a * qt_Opacity;
+            }
+        "
+
+    fillMode: Image.PreserveAspectFit
+    height: sourceSize.height
+
+    ShaderEffect {
+        readonly property color color: root.color
+        readonly property Image source: parent
+
+        height: source.height; width: source.width
+        fragmentShader: fragColorShader
+    }
+}

=== added file 'qml/Greeter/SessionsList.qml'
--- qml/Greeter/SessionsList.qml	1970-01-01 00:00:00 +0000
+++ qml/Greeter/SessionsList.qml	2016-09-22 07:47:54 +0000
@@ -0,0 +1,187 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+import "." 0.1
+import "../Components"
+
+Item {
+    id: root
+    objectName: "sessionsList"
+
+    property string initiallySelectedSession
+    signal sessionSelected(string sessionKey)
+    signal showLoginList()
+
+    onInitiallySelectedSessionChanged: {
+        sessionsList.currentIndex = getSelectedIndex();
+        sessionsList.positionViewAtIndex(sessionsList.currentIndex, ListView.Contain);
+    }
+
+    function getSelectedIndex() {
+        for (var i = 0; i < sessionsList.model.count; i++) {
+            var key = sessionsList.model.get(i).key
+            if (key === initiallySelectedSession) {
+                return i;
+            }
+        }
+    }
+
+    function currentKey() {
+        var session = LightDMService.sessions.data(
+            sessionsList.currentIndex, LightDMService.sessionRoles.KeyRole)
+        return session;
+    }
+
+    Keys.onEnterPressed: {
+        showLoginList(); // Session is already selected
+        event.accepted = true;
+    }
+
+    Keys.onEscapePressed: {
+        showLoginList();
+        event.accepted = true;
+    }
+
+    Keys.onReturnPressed: {
+        showLoginList();
+        event.accepted = true;
+    }
+
+    Keys.onDownPressed: {
+        if (sessionsList.currentIndex < sessionsList.model.count - 1)
+            sessionsList.currentIndex++;
+        sessionSelected(currentKey());
+        event.accepted = true;
+    }
+
+    Keys.onUpPressed: {
+        if (sessionsList.currentIndex > 0)
+            sessionsList.currentIndex--;
+        sessionSelected(currentKey());
+        event.accepted = true;
+    }
+
+    LoginAreaContainer {
+        readonly property real margins: sessionsList.anchors.margins
+        readonly property real prefferedHeight: {
+            if (sessionsList.currentItem) {
+                return (sessionsList.currentItem.height *
+                       (1 + sessionsList.model.count)) + 2 * margins
+            } else {
+                return sessionsList.headerItem.height + 2 * margins
+            }
+        }
+
+        height: prefferedHeight < parent.height ? prefferedHeight : parent.height - units.gu(4)
+        width: parent.width
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+
+        UbuntuListView {
+            id: sessionsList
+
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+                margins: units.gu(2)
+            }
+
+            height: parent.height - headerItem.height
+
+            boundsBehavior: Flickable.StopAtBounds
+
+            model: LightDMService.sessions
+            header: ListItemLayout {
+                id: header
+
+                padding.leading: 0 // handled by parent's margins
+
+                title.color: theme.palette.normal.raisedText
+                title.font.pixelSize: units.gu(2.1)
+                title.text: i18n.tr("Select desktop environment")
+
+                Icon {
+                    id: icon
+                    width: units.gu(3)
+                    SlotsLayout.position: SlotsLayout.Leading
+                    name: "go-previous"
+
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: showLoginList()
+                    }
+                }
+            }
+
+            headerPositioning: ListView.OverlayHeader
+            highlightFollowsCurrentItem: false
+
+            delegate: ListItem {
+                id: delegate
+                objectName: "sessionDelegate" + index
+
+                divider.visible: false
+
+                visible: y > sessionsList.headerItem.y
+                + sessionsList.headerItem.height
+                - sessionsList.anchors.margins
+
+               MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        sessionsList.currentIndex = index
+                        sessionSelected(key)
+                        showLoginList()
+                    }
+                }
+
+                Rectangle {
+                    height: parent.height
+                    width: parent.width
+                    color: "transparent"
+                    border {
+                        color: theme.palette.normal.focus
+                        width: units.gu(0.2)
+                    }
+
+                    visible: index === sessionsList.currentIndex
+                }
+
+                ListItemLayout {
+                    id: layout
+
+                    SessionIcon {
+                        id: sessionIcon
+                        source: icon_url
+                        SlotsLayout.position: SlotsLayout.Leading
+                        color: theme.palette.normal.raisedSecondaryText
+                    }
+
+                    title.text: display
+                    title.color: theme.palette.normal.raisedText
+                }
+            }
+        }
+    }
+}

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2016-07-07 19:52:57 +0000
+++ qml/Greeter/WideView.qml	2016-09-22 07:47:54 +0000
@@ -16,25 +16,29 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import "." 0.1
 
 FocusScope {
     id: root
     focus: true
 
+    property alias background: coverPage.background
+    property alias backgroundTopMargin: coverPage.backgroundTopMargin
+    property alias hasCustomBackground: coverPage.hasCustomBackground
     property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
+    property alias infographicModel: coverPage.infographicModel
     property alias launcherOffset: coverPage.launcherOffset
     property alias currentIndex: loginList.currentIndex
     property int delayMinutes // TODO
-    property alias backgroundTopMargin: coverPage.backgroundTopMargin
-    property alias background: coverPage.background
-    property bool locked
     property alias alphanumeric: loginList.alphanumeric
-    property alias userModel: loginList.model
-    property alias infographicModel: coverPage.infographicModel
-    property bool waiting
+    property alias locked: loginList.locked
+    property alias sessionToStart: loginList.currentSession
+    property alias waiting: loginList.waiting
+    property var userModel // Set from outside
+
+    readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
     readonly property bool fullyShown: coverPage.showProgress === 1
     readonly property bool required: coverPage.required
-    readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
 
     // so that it can be replaced in tests with a mock object
     property var inputMethod: Qt.inputMethod
@@ -44,6 +48,14 @@
     signal tease()
     signal emergencyCall() // unused
 
+    function notifyAuthenticationFailed() {
+        loginList.showError();
+    }
+
+    function reset(forceShow) {
+        loginList.reset();
+    }
+
     function showMessage(html) {
         loginList.showMessage(html);
     }
@@ -52,30 +64,6 @@
         loginList.showPrompt(text, isSecret, isDefaultPrompt);
     }
 
-    function showLastChance() {
-        // TODO
-    }
-
-    function hide() {
-        coverPage.hide();
-    }
-
-    function notifyAuthenticationSucceeded(showFakePassword) {
-        // Nothing needed
-    }
-
-    function notifyAuthenticationFailed() {
-        loginList.showError();
-    }
-
-    function showErrorMessage(msg) {
-        coverPage.showErrorMessage(msg);
-    }
-
-    function reset() {
-        loginList.reset();
-    }
-
     function tryToUnlock(toTheRight) {
         if (root.locked) {
             coverPage.show();
@@ -92,6 +80,20 @@
         }
     }
 
+    function hide() {
+        coverPage.hide();
+    }
+
+    function notifyAuthenticationSucceeded(showFakePassword) {
+        if (showFakePassword) {
+            loginList.showFakePassword();
+        }
+    }
+
+    function showLastChance() {
+        // TODO
+    }
+
     Rectangle {
         anchors.fill: parent
         color: "black"
@@ -104,6 +106,7 @@
         height: parent.height
         width: parent.width
         draggable: !root.locked && !root.waiting
+        state: "LoginList"
 
         infographics {
             height: 0.75 * parent.height
@@ -122,21 +125,89 @@
             id: loginList
             objectName: "loginList"
 
-            anchors {
-                left: parent.left
-                leftMargin: Math.min(parent.width * 0.16, units.gu(20))
-                top: parent.top
-            }
             width: units.gu(40)
-            height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
-                                                       : parent.height
-            Behavior on height { UbuntuNumberAnimation {} }
-
-            locked: root.locked
-            waiting: root.waiting
-
+            anchors {
+                left: parent.left
+                leftMargin: Math.min(parent.width * 0.16, units.gu(20))
+                top: parent.top
+                bottom: parent.bottom
+            }
+
+            boxVerticalOffset: (height - highlightedHeight -
+                               (inputMethod && inputMethod.visible ?
+                                inputMethod.keyboardRectangle.height : 0)) / 2
+            Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
+
+            model: root.userModel
+            currentSession: LightDMService.greeter.defaultSession
+            onResponded: root.responded(response)
             onSelected: root.selected(index)
-            onResponded: root.responded(response)
-        }
+            onSessionChooserButtonClicked: parent.state = "SessionsList"
+
+            Keys.forwardTo: [sessionChooserLoader.item]
+        }
+
+        Loader {
+            id: sessionChooserLoader
+
+            height: loginList.height
+            width: loginList.width
+            anchors {
+                left: parent.left
+                leftMargin: Math.min(parent.width * 0.16, units.gu(20))
+                top: parent.top
+            }
+
+            active: false
+
+            onLoaded: sessionChooserLoader.item.forceActiveFocus();
+            Binding {
+                target: sessionChooserLoader.item
+                property: "initiallySelectedSession"
+                value: loginList.currentSession
+            }
+
+            Connections {
+                target: sessionChooserLoader.item
+                onSessionSelected: loginList.currentSession = sessionKey
+                onShowLoginList: {
+                    coverPage.state = "LoginList"
+                    loginList.passwordInput.forceActiveFocus();
+                }
+                ignoreUnknownSignals: true
+            }
+        }
+
+        states: [
+            State {
+                name: "SessionsList"
+                PropertyChanges { target: loginList; opacity: 0 }
+                PropertyChanges { target: sessionChooserLoader;
+                                  active: true;
+                                  opacity: 1
+                                  source: "SessionsList.qml"
+                                }
+            },
+
+            State {
+                name: "LoginList"
+                PropertyChanges { target: loginList; opacity: 1 }
+                PropertyChanges { target: sessionChooserLoader;
+                                  active: false;
+                                  opacity: 0
+                                  source: "";
+                                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "*"
+                to: "*"
+                UbuntuNumberAnimation {
+                    property: "opacity";
+                }
+            }
+        ]
     }
 }

=== removed file 'qml/Greeter/graphics/infographic_circle_back.png'
Binary files qml/Greeter/graphics/infographic_circle_back.png	2016-06-03 23:00:28 +0000 and qml/Greeter/graphics/infographic_circle_back.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'qml/Greeter/graphics/session_icons'
=== added file 'qml/Greeter/graphics/session_icons/gnome_badge.png'
Binary files qml/Greeter/graphics/session_icons/gnome_badge.png	1970-01-01 00:00:00 +0000 and qml/Greeter/graphics/session_icons/gnome_badge.png	2016-09-22 07:47:54 +0000 differ
=== added file 'qml/Greeter/graphics/session_icons/kde_badge.png'
Binary files qml/Greeter/graphics/session_icons/kde_badge.png	1970-01-01 00:00:00 +0000 and qml/Greeter/graphics/session_icons/kde_badge.png	2016-09-22 07:47:54 +0000 differ
=== added file 'qml/Greeter/graphics/session_icons/recovery_console_badge.png'
Binary files qml/Greeter/graphics/session_icons/recovery_console_badge.png	1970-01-01 00:00:00 +0000 and qml/Greeter/graphics/session_icons/recovery_console_badge.png	2016-09-22 07:47:54 +0000 differ
=== added file 'qml/Greeter/graphics/session_icons/ubuntu_badge.png'
Binary files qml/Greeter/graphics/session_icons/ubuntu_badge.png	1970-01-01 00:00:00 +0000 and qml/Greeter/graphics/session_icons/ubuntu_badge.png	2016-09-22 07:47:54 +0000 differ
=== added file 'qml/Greeter/graphics/session_icons/unknown_badge.png'
Binary files qml/Greeter/graphics/session_icons/unknown_badge.png	1970-01-01 00:00:00 +0000 and qml/Greeter/graphics/session_icons/unknown_badge.png	2016-09-22 07:47:54 +0000 differ
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2016-07-27 14:51:26 +0000
+++ qml/Launcher/LauncherPanel.qml	2016-09-22 07:47:54 +0000
@@ -19,7 +19,7 @@
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 1.3
 import "../Components/ListItems"
-import "../Components/"
+import "../Components"
 
 Rectangle {
     id: root

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2015-09-29 12:28:10 +0000
+++ qml/Panel/IndicatorPage.qml	2016-09-22 07:47:54 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3 as Components
 import Unity.Indicators 0.1 as Indicators
+import "../Components"
 import "Indicators"
 
 IndicatorBase {

=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-09-29 12:28:10 +0000
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2016-09-22 07:47:54 +0000
@@ -20,25 +20,42 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import "../.."
 
 Page {
     id: root
-
-    title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title :
-                                                              indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName
-                                                                                                                        : ""
     property variant indicatorProperties
 
+    header: PageHeader {
+        title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title :
+                                                                  indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName
+                                                                                                                            : identifier
+    }
+
     anchors.fill: parent
 
-    ListItem.Standard {
+    ListItem {
+        color: theme.palette.highlighted.background
         id: visualCheckItem
-        text: "Enable Visual Representation"
-        control: Switch {
-            id: visualCheck
-            checked: true
+
+        anchors {
+            top: header.bottom
+            left: parent.left
+            right: parent.right
+        }
+
+        height: selectorLayout.height
+        onClicked: visualCheck.checked = !visualCheck.checked
+
+        ListItemLayout {
+            id: selectorLayout
+            title.text: "Enable Visual Representation"
+
+            Switch {
+                id: visualCheck
+                checked: true
+                SlotsLayout.position: SlotsLayout.Trailing
+            }
         }
     }
 
@@ -48,11 +65,6 @@
         clip:true
         asynchronous: true
 
-        Rectangle {
-            anchors.fill: pageLoader
-            color: "#221e1c" // FIXME not in palette yet
-        }
-
         anchors {
             top: visualCheckItem.bottom
             left: parent.left
@@ -92,13 +104,5 @@
             margins: units.gu(1)
         }
         height: childrenRect.height
-
-        Button {
-            anchors {
-                left: parent.left
-            }
-            text: "Back"
-            onClicked: root.pageStack.reset()
-        }
     }
 }

=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2016-06-14 10:32:17 +0000
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2016-09-22 07:47:54 +0000
@@ -21,8 +21,8 @@
 import Ubuntu.Components 1.3
 
 Rectangle {
+    id: root
     color: theme.palette.normal.background
-    id: root
 
     Component.onCompleted: {
         theme.name = "Ubuntu.Components.Themes.SuruDark"

=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
--- qml/Panel/Indicators/client/IndicatorsList.qml	2016-06-14 10:32:17 +0000
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,19 +15,22 @@
  *
  * Authors:
  *      Renato Araujo Oliveira Filho <[e-mail]>
+ *      Marco Trevisan <[e-mail]>
  */
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Indicators 0.1 as Indicators
 import "../.."
+import "../../../Components"
 
 Page {
     id: page
     anchors.fill: parent
     property string profile: ""
-    title: "Plugin list"
+    header: PageHeader {
+        title: "Indicators List"
+    }
 
     Indicators.IndicatorsModel {
         id: indicatorsModel
@@ -41,32 +44,24 @@
         anchors.fill: parent
         model: indicatorsModel
 
-        delegate: Rectangle {
-            color: "#221e1c"
-
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: menuItem.height
-
-            ListItem.Standard {
+        delegate: ListItem {
+            objectName: identifier
+            height: menuItem.height + (divider.visible ? divider.height : 0)
+
+            ListItemLayout {
                 id: menuItem
-                anchors.left: parent.left
-                anchors.right: parent.right
-                objectName: identifier
-
-                text: identifier
-
-                onClicked: {
-                    var new_page = Qt.createComponent("IndicatorRepresentation.qml");
-                    if (new_page.status !== Component.Ready) {
-                        if (new_page.status === Component.Error)
-                            console.error("Error: " + new_page.errorString());
-
-                        return;
-                    }
-
-                    page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
+                title.text: identifier
+            }
+
+            onClicked: {
+                var new_page = Qt.createComponent("IndicatorRepresentation.qml");
+                if (new_page.status !== Component.Ready) {
+                    if (new_page.status === Component.Error)
+                        console.error("Error: " + new_page.errorString());
+
+                    return;
                 }
+                page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
             }
         }
     }

=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2015-07-15 15:07:19 +0000
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2016-09-22 07:47:54 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import ".."
+import "../../../Components"
 
 IndicatorBase {
     id: root
@@ -30,14 +31,10 @@
         model: root.menuModel
     }
 
-    Flickable {
+    TextArea {
         anchors.fill: parent
-        contentHeight: all_data.height
-        clip:true
-        Text {
-            id: all_data
-            color: "white"
-            text: printer.text
-        }
+        anchors.margins: units.gu(0.5)
+        id: all_data
+        text: printer.text
     }
 }

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2016-06-20 10:31:44 +0000
+++ qml/Panel/Panel.qml	2016-09-22 07:47:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,15 +100,12 @@
             }
             height: indicators.minimizedPanelHeight
             hoverEnabled: true
-            onClicked: callHint.visible ? callHint.showLiveCall() : PanelState.focusMaximizedApp()
-            onDoubleClicked: PanelState.restoreClicked()
+            onClicked: if (callHint.visible) { callHint.showLiveCall(); }
 
-            property bool mouseWasPressed: false
-            onPressed: mouseWasPressed = containsPress
-            onMouseYChanged: {
-                if (mouseWasPressed && mouseY > panelHeight) {
-                    PanelState.restoreClicked(); // restore the window when "dragging" the panel down
-                    mouseWasPressed = false;
+            onPressed: {
+                if (!callHint.visible) {
+                    // let it fall through to the window decoration of the maximized window behind, if any
+                    mouse.accepted = false;
                 }
             }
 
@@ -120,11 +117,8 @@
                 anchors {
                     left: parent.left
                     top: parent.top
-                    leftMargin: units.gu(1)
-                    topMargin: units.gu(0.5)
-                    bottomMargin: units.gu(0.5)
                 }
-                height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
+                height: indicators.minimizedPanelHeight
 
                 visible: ((PanelState.buttonsVisible && parent.containsMouse) || PanelState.buttonsAlwaysVisible)
                          && !root.locked && !callHint.visible
@@ -183,13 +177,15 @@
             }
             color: "white"
             height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
-            visible: !windowControlButtons.visible && !root.locked && !callHint.visible
+            opacity: !windowControlButtons.visible && !root.locked && !callHint.visible ? 1 : 0
+            visible: opacity != 0
             verticalAlignment: Text.AlignVCenter
             fontSize: "medium"
             font.weight: PanelState.buttonsVisible ? Font.Light : Font.Medium
             text: PanelState.title
             elide: Text.ElideRight
             maximumLineCount: 1
+            Behavior on opacity { UbuntuNumberAnimation {} }
         }
 
         // TODO here would the Locally integrated menus come

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-08-19 09:16:28 +0000
+++ qml/Shell.qml	2016-09-22 07:47:54 +0000