Unity 8

Merge lp:~mzanetti/unity8/launcher-updates into lp:unity8

launcher-updates
Merge into trunk

Proposed by Michael Zanetti on 2015-11-25

Status:	Superseded
Proposed branch:	lp:~mzanetti/unity8/launcher-updates
Merge into:	lp:unity8
Diff against target:	2110 lines (+941/-125) 28 files modified CMakeLists.txt (+1/-1) debian/control (+3/-3) plugins/AccountsService/AccountsService.cpp (+54/-0) plugins/AccountsService/AccountsService.h (+8/-0) qml/Components/EdgeBarrier.qml (+1/-1) qml/Components/PhysicalKeysMapper.qml (+24/-0) qml/Launcher/Launcher.qml (+113/-3) qml/Launcher/LauncherDelegate.qml (+46/-8) qml/Launcher/LauncherPanel.qml (+103/-32) qml/Launcher/graphics/launcher-app-focus-ring.svg (+12/-0) qml/Shell.qml (+33/-0) qml/Stages/ApplicationWindow.qml (+8/-0) qml/Stages/DecoratedWindow.qml (+8/-0) qml/Stages/DesktopSpread.qml (+59/-16) qml/Stages/DesktopSpreadDelegate.qml (+15/-1) qml/Stages/DesktopStage.qml (+40/-23) qml/Stages/SurfaceContainer.qml (+36/-1) tests/mocks/AccountsService/AccountsService.cpp (+17/-0) tests/mocks/AccountsService/AccountsService.h (+8/-0) tests/mocks/Unity/Application/MirSurface.cpp (+15/-1) tests/mocks/Unity/Application/MirSurface.h (+6/-0) tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+2/-0) tests/plugins/AccountsService/PropertiesServer.cpp (+10/-1) tests/plugins/AccountsService/PropertiesServer.h (+0/-1) tests/plugins/AccountsService/client.cpp (+29/-0) tests/qmltests/Launcher/tst_Launcher.qml (+147/-5) tests/qmltests/Stages/tst_DesktopStage.qml (+29/-3) tests/qmltests/tst_Shell.qml (+114/-25)
To merge this branch:	bzr merge lp:~mzanetti/unity8/launcher-updates
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2015-11-25	Approve on 2016-02-12
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-02
Albert Astals Cid (community)			Abstain on 2016-02-02
Unity8 CI Bot	continuous-integration		Approve on 2016-01-14
Andrea Cimitan (community)			Needs Information on 2015-12-08
Review via email: mp+278567@code.launchpad.net

This proposal has been superseded by a proposal from 2016-02-17.

Commit Message

Implement Launcher's keyboard navigation and updated pip design

Description of the Change

This implements the launcher design updates as specified in the Trello card with one exception. The launcher's width changes have been revised by design by now. We're gonna keep it it 8gu wide by default.

* Are there any related MPs required for this MP to build/function as expected? Please list.
n
* Did you perform an exploratory manual test run of your code change and any related functionality?
y
* Did you make sure that your branch does not contain spurious tags?
y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
* If you changed the UI, has there been a design review?
yes

Lukáš Tinkl (lukas-kde) wrote on 2015-12-07:

Please add a little test for the Alt+F1 and arrow keys functionality

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-12-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6886/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-12-07:

qmltestrunner.Shell::test_altBackTabNavigation
qmltestrunner.Shell::test_altTabSwitchesFocus
qmltestrunner.Shell::test_altTabWrapAround
qmltestrunner.Shell::test_closeFromSpread
qmltestrunner.Shell::test_focusAppFromLauncherExitsSpread
qmltestrunner.Shell::test_highlightFollowsMouse
qmltestrunner.Shell::test_hoverMouseAreaDisabledAndInvisible
qmltestrunner.Shell::test_progressiveAutoScrolling
qmltestrunner.Shell::test_selectFromSpreadWithMouse
qmltestrunner.Shell::test_workspacePreviewsHighlightedApp

There are tests failing (could reproduce the failures locally as well)

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-12-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6888/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6890/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6891/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-12-08:

Code looks good, works perfectly and tests finally passing, approving

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

Yes

* Did CI run pass? If not, please explain why.

Yes (modulo xenial)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Andrea Cimitan (cimi) wrote on 2015-12-08:

minor thing

review: Needs Information

Michael Zanetti (mzanetti) wrote on 2015-12-09:

> minor thing

replied/fixed

Michael Zanetti (mzanetti) on 2015-12-09:

Albert Astals Cid (aacid) wrote on 2015-12-14:

Note for later: This was already top approved.

Text conflict in tests/qmltests/tst_Shell.qml
1 conflicts encountered.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-12-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6927/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-12-15:

> Note for later: This was already top approved.
>
> Text conflict in tests/qmltests/tst_Shell.qml
> 1 conflicts encountered.

merged

Albert Astals Cid (aacid) wrote on 2015-12-15:

Re-top-approving after merge

review: Abstain (merges fine)

Lukáš Tinkl (lukas-kde) wrote on 2015-12-15:

Still under review, hold on a bit :)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6945/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6954/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-12-15:

Re-approving after keyboard shortcut and test fixes

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

Yes

* Did CI run pass? If not, please explain why.

Yes (modulo xenial)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6957/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-01-13:

Text conflict in qml/Launcher/LauncherPanel.qml
1 conflicts encountered

Was already top approved.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2016-01-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7054/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-01-13:

> Text conflict in qml/Launcher/LauncherPanel.qml
> 1 conflicts encountered
>
> Was already top approved.

merged

Lukáš Tinkl (lukas-kde) wrote on 2016-01-13:

Re-approving

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2016-01-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7058/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-01-14:

Actually

make xvfbtestLauncher FUNCTION="Launcher::test_launcher_dismiss"

seems to consistently fail in this branch for me while it works on trunk, can you have a look?

review: Needs Fixing

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

PASSED: Continuous integration, rev:2069
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/62/
Executed test runs:

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-01-14:

> Actually
>
> make xvfbtestLauncher FUNCTION="Launcher::test_launcher_dismiss"
>
> seems to consistently fail in this branch for me while it works on trunk, can
> you have a look?

fixed. the test was clicking on the new UI elements instead of the empty space. I fixed this already some few weeks ago but seems some branch reverted the fix in the meantime again and in trunk it's only clicking between the control layouts by luck...

Albert Astals Cid (aacid) wrote on 2016-01-14:

Tests pass now

review: Abstain

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

FAILED: Continuous integration, rev:2070
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/64/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7063/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-01-14:

Wops, whitespaces need fixing

review: Needs Fixing

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

FAILED: Continuous integration, rev:2071
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/67/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7066/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2016-01-14:

review: Abstain (whitespace is good)

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

PASSED: Continuous integration, rev:2072
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/73/
Executed test runs:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7071/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-01-15:

Works (and looks) fine now with the other launcher-sizing branch, approving

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

Yes

* Did CI run pass? If not, please explain why.

Yes (minus some unrelated xenial failures, passes locally xenial just fine)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Albert Astals Cid (aacid) wrote on 2016-02-02:

Note this was already top-approved, re-approve after merge

Text conflict in qml/Components/PhysicalKeysMapper.qml
1 conflicts encountered.

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-02-02:

Merges fine, re-top approving

review: Abstain

PS Jenkins bot (ps-jenkins) wrote on 2016-02-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7194/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-02-12:

Re-approving (again)

review: Approve

lp:~mzanetti/unity8/launcher-updates updated on 2016-02-25

2075. By Michael Zanetti on 2016-02-12: merge silo 51 as prereq
2076. By Michael Zanetti on 2016-02-17: merge trunk
2077. By Michael Zanetti on 2016-02-25: fix an issue where the highlight might not be removed after launching

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-02-12 00:12:30 +0000
 +++ CMakeLists.txt	2016-02-17 16:21:55 +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=13)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
  pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
 === modified file 'debian/control'
 --- debian/control	2016-02-12 00:12:30 +0000
 +++ debian/control	2016-02-17 16:21:55 +0000
@@ -29,7 +29,7 @@
                 libqt5xmlpatterns5-dev,
                 libsystemsettings-dev,
                 libudev-dev,
--               libunity-api-dev (>= 7.106),
++               libunity-api-dev (>= 7.107),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!armhf],
@@ -131,7 +131,7 @@
           qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
           qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
           ubuntu-thumbnailer-impl-0,
--         unity-application-impl-13,
++         unity-application-impl-14,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-9,
@@ -177,7 +177,7 @@
  Depends: ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-application-impl,
--          unity-application-impl-13,
++          unity-application-impl-14,
  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 'plugins/AccountsService/AccountsService.cpp'
 --- plugins/AccountsService/AccountsService.cpp	2016-01-21 21:04:00 +0000
 +++ plugins/AccountsService/AccountsService.cpp	2016-02-17 16:21:55 +0000
@@ -24,6 +24,10 @@
  #include <QStringList>
  #include <QDebug>
++using StringMap = QMap<QString,QString>;
++using StringMapList = QList<StringMap>;
++Q_DECLARE_METATYPE(StringMapList)
++
  AccountsService::AccountsService(QObject* parent, const QString &user)
      : QObject(parent),
      m_service(new AccountsServiceDBusAdaptor(this)),
@@ -71,6 +75,7 @@
      updateFailedLogins(false);
      updateHereEnabled(false);
      updateHereLicensePath(false);
++    updateKeymaps(false);
+ }
  bool AccountsService::demoEdges() const
@@ -138,6 +143,15 @@
      return !m_hereLicensePath.isNull();
+ }
++QStringList AccountsService::keymaps() const
++{
++    if (!m_kbdMap.isEmpty()) {
++        return m_kbdMap;
++    }
++
++    return {QStringLiteral("us")};
++}
++
  void AccountsService::updateDemoEdges(bool async)
+ {
      QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
@@ -448,6 +462,45 @@
+     }
+ }
++void AccountsService::updateKeymaps(bool async)
++{
++    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
++                                                                    QStringLiteral("org.freedesktop.Accounts.User"),
++                                                                    QStringLiteral("InputSources"));
++    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
++
++    connect(watcher, &QDBusPendingCallWatcher::finished,
++            this, [this](QDBusPendingCallWatcher* watcher) {
++
++        QDBusPendingReply<QDBusVariant> reply = *watcher;
++        watcher->deleteLater();
++        if (reply.isError()) {
++            qWarning() << "Failed to get 'InputSources' property - " << reply.error().message();
++            return;
++        }
++
++        const QStringList previousKeymaps = keymaps();
++        m_kbdMap.clear();
++        StringMapList maps;
++        QDBusArgument arg = reply.value().variant().value<QDBusArgument>();
++        maps = qdbus_cast<StringMapList>(arg);
++
++        Q_FOREACH(const StringMap & map, maps) {
++            Q_FOREACH(const QString &entry, map) {
++                m_kbdMap.append(entry);
++            }
++        }
++
++        if (previousKeymaps != m_kbdMap) {
++            Q_EMIT keymapsChanged();
++        }
++    });
++    if (!async) {
++        watcher->waitForFinished();
++        delete watcher;
++    }
++}
++
  uint AccountsService::failedLogins() const
+ {
      return m_failedLogins;
@@ -516,4 +569,5 @@
      // Standard properties might have changed
      updateBackgroundFile();
++    updateKeymaps();
+ }
 === modified file 'plugins/AccountsService/AccountsService.h'
 --- plugins/AccountsService/AccountsService.h	2016-01-21 21:04:00 +0000
 +++ plugins/AccountsService/AccountsService.h	2016-02-17 16:21:55 +0000
@@ -21,6 +21,7 @@
  #include <QObject>
  #include <QString>
++#include <QStringList>
  class AccountsServiceDBusAdaptor;
  class QDBusInterface;
@@ -66,6 +67,9 @@
      Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
                 READ hereLicensePathValid
                 NOTIFY hereLicensePathChanged)
++    Q_PROPERTY(QStringList keymaps
++               READ keymaps
++               NOTIFY keymapsChanged)
  public:
      enum PasswordDisplayHint {
@@ -91,6 +95,7 @@
      void setHereEnabled(bool enabled);
      QString hereLicensePath() const;
      bool hereLicensePathValid() const;
++    QStringList keymaps() const;
  Q_SIGNALS:
      void userChanged();
@@ -103,6 +108,7 @@
      void failedLoginsChanged();
      void hereEnabledChanged();
      void hereLicensePathChanged();
++    void keymapsChanged();
  private Q_SLOTS:
      void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -120,6 +126,7 @@
      void updateFailedLogins(bool async = true);
      void updateHereEnabled(bool async = true);
      void updateHereLicensePath(bool async = true);
++    void updateKeymaps(bool async = true);
      AccountsServiceDBusAdaptor *m_service;
      QDBusInterface *m_unityInput;
@@ -133,6 +140,7 @@
      uint m_failedLogins;
      bool m_hereEnabled;
      QString m_hereLicensePath;
++    QStringList m_kbdMap;
  };
  #endif
 === modified file 'qml/Components/EdgeBarrier.qml'
 --- qml/Components/EdgeBarrier.qml	2015-11-24 17:44:18 +0000
 +++ qml/Components/EdgeBarrier.qml	2016-02-17 16:21:55 +0000
@@ -105,7 +105,7 @@
          },
          Transition {
              from: "resisting"; to: "passed"
--            UbuntuNumberAnimation { target: materialContainer; property: "opacity" }
++            UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration; target: materialContainer; property: "opacity" }
+         }
+     ]
+ }
 === modified file 'qml/Components/PhysicalKeysMapper.qml'
 --- qml/Components/PhysicalKeysMapper.qml	2016-01-13 18:43:34 +0000
 +++ qml/Components/PhysicalKeysMapper.qml	2016-02-17 16:21:55 +0000
@@ -42,12 +42,15 @@
      signal screenshotTriggered;
      readonly property bool altTabPressed: d.altTabPressed
++    readonly property bool superPressed: d.superPressed
++    readonly property bool superTabPressed: d.superTabPressed
      property int powerKeyLongPressTime: 2000
      // For testing. If running windowed (e.g. tryShell), Alt+Tab is taken by the
      // running desktop, set this to true to use Ctrl+Tab instead.
      property bool controlInsteadOfAlt: false
++    property bool controlInsteadOfSuper: false
      QtObject {
          id: d
@@ -59,6 +62,9 @@
          property bool altPressed: false
          property bool altTabPressed: false
++        property bool superPressed: false
++        property bool superTabPressed: false
++
          property var powerButtonPressStart: 0
          // We need to eat ALT presses until we know what they're for (Alt+Tab or going to the app?)
@@ -119,11 +125,23 @@
                  event.accepted = true;
                  d.altPressInjected = false;
+             }
++
++        // Adding MetaModifier here because that's what keyboards do. Pressing Super_L actually gives
++        // Super_L + MetaModifier. This helps to make sure we only invoke superPressed if no other
++        // Modifier is pressed too.
++        } else if (((event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R) && event.modifiers === Qt.MetaModifier)
++                    || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)
++                    ) {
++            d.superPressed = true;
          } else if (event.key == Qt.Key_Tab) {
              if (d.altPressed && !d.altTabPressed) {
                  d.altTabPressed = true;
                  event.accepted = true;
+             }
++            if (d.superPressed && !d.superTabPressed) {
++                d.superTabPressed = true;
++                event.accepted = true;
++            }
+         }
+     }
@@ -154,6 +172,12 @@
              if (d.altTabPressed) {
                  event.accepted = true;
+             }
++        } else if (event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)) {
++            d.superPressed = false;
++            if (d.superTabPressed) {
++                d.superTabPressed = false;
++                event.accepted = true;
++            }
+         }
+     }
+ }
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2016-01-19 15:26:15 +0000
 +++ qml/Launcher/Launcher.qml	2016-02-17 16:21:55 +0000
@@ -19,8 +19,9 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  import Unity.Launcher 0.1
++import GlobalShortcut 1.0
--Item {
++FocusScope {
      id: root
      property bool autohideEnabled: false
@@ -34,6 +35,9 @@
      property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
                                  (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
++    property bool superPressed: false
++    property bool superTabPressed: false
++
      readonly property bool dragging: dragArea.dragging
      readonly property real dragDistance: dragArea.dragging ? dragArea.touchX : 0
      readonly property real visibleWidth: panel.width + panel.x
@@ -57,6 +61,37 @@
+         }
+     }
++    onSuperPressedChanged: {
++        if (superPressed) {
++            superPressTimer.start();
++            superLongPressTimer.start();
++        } else {
++            superPressTimer.stop();
++            superLongPressTimer.stop();
++            launcher.switchToNextState("");
++            panel.shortcutHintsShown = false;
++        }
++    }
++
++    onSuperTabPressedChanged: {
++        if (superTabPressed) {
++            switchToNextState("visible")
++            panel.highlightIndex = -1;
++            root.focus = true;
++            superPressTimer.stop();
++            superLongPressTimer.stop();
++        } else {
++            if (panel.highlightIndex == -1) {
++                showDashHome();
++            } else if (panel.highlightIndex >= 0){
++                launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
++            }
++            panel.highlightIndex = -2;
++            switchToNextState("");
++            root.focus = false;
++        }
++    }
++
      function hide() {
          switchToNextState("")
+     }
@@ -90,6 +125,76 @@
+         }
+     }
++    function openForKeyboardNavigation() {
++        panel.highlightIndex = -1; // The BFB
++        root.focus = true;
++        switchToNextState("visible")
++    }
++
++    Keys.onPressed: {
++        switch (event.key) {
++        case Qt.Key_Backtab:
++            panel.highlightPrevious();
++            event.accepted = true;
++            break;
++        case Qt.Key_Up:
++            if (root.inverted) {
++                panel.highlightNext()
++            } else {
++                panel.highlightPrevious();
++            }
++            event.accepted = true;
++            break;
++        case Qt.Key_Tab:
++            panel.highlightNext();
++            event.accepted = true;
++            break;
++        case Qt.Key_Down:
++            if (root.inverted) {
++                panel.highlightPrevious();
++            } else {
++                panel.highlightNext();
++            }
++            event.accepted = true;
++            break;
++        case Qt.Key_Right:
++            panel.openQuicklist(panel.highlightIndex)
++            event.accepted = true;
++            break;
++        case Qt.Key_Escape:
++            panel.highlightIndex = -2
++            // Falling through intentionally
++        case Qt.Key_Enter:
++        case Qt.Key_Return:
++        case Qt.Key_Space:
++            if (panel.highlightIndex == -1) {
++                showDashHome();
++            } else if (panel.highlightIndex >= 0) {
++                launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
++            }
++            root.state = ""
++            event.accepted = true;
++            root.focus = false;
++        }
++    }
++
++    Timer {
++        id: superPressTimer
++        interval: 200
++        onTriggered: {
++            switchToNextState("visible")
++        }
++    }
++
++    Timer {
++        id: superLongPressTimer
++        interval: 1000
++        onTriggered: {
++            switchToNextState("visible")
++            panel.shortcutHintsShown = true;
++        }
++    }
++
      Timer {
          id: teaseTimer
          interval: mode == "teasing" ? 200 : 300
@@ -202,8 +307,8 @@
                      rotation: -90
                      anchors.centerIn: parent
                      gradient: Gradient {
--                        GradientStop { position: 0.0; color: panel.color}
--                        GradientStop { position: 1.0; color: Qt.rgba(panel.r,panel.g,panel.b,0)}
++                        GradientStop { position: 0.0; color: Qt.rgba(panel.color.r, panel.color.g, panel.color.b, .5)}
++                        GradientStop { position: 1.0; color: Qt.rgba(panel.color.r,panel.color.g,panel.color.b,0)}
+                     }
+                 }
+             }
@@ -254,6 +359,11 @@
+             }
+         }
++        onKbdNavigationCancelled: {
++            root.state = "";
++            root.focus = false;
++        }
++
          Behavior on x {
              enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate;
              NumberAnimation {
 === modified file 'qml/Launcher/LauncherDelegate.qml'
 --- qml/Launcher/LauncherDelegate.qml	2015-11-19 16:55:31 +0000
 +++ qml/Launcher/LauncherDelegate.qml	2016-02-17 16:21:55 +0000
@@ -20,6 +20,7 @@
  Item {
      id: root
++    property int itemIndex: 0
      property string iconName
      property int count: 0
      property bool countVisible: false
@@ -29,10 +30,12 @@
      property real maxAngle: 0
      property bool inverted: false
      property bool alerting: false
--    readonly property alias wiggling: wiggleAnim.running
++    property bool highlighted: false
++    property bool shortcutHintShown: false
      readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
      readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
++    readonly property alias wiggling: wiggleAnim.running
      property int itemWidth
      property int itemHeight
@@ -125,6 +128,17 @@
          height: parent.itemHeight + units.gu(1)
          anchors.centerIn: parent
++        Image {
++            objectName: "focusRing"
++            anchors.centerIn: iconShape
++            height: width * 15 / 16
++            width: iconShape.width + units.gu(1)
++            source: "graphics/launcher-app-focus-ring.svg"
++            sourceSize.width: width
++            sourceSize.height: height
++            visible: root.highlighted
++        }
++
          ProportionalShape {
              id: iconShape
              anchors.centerIn: parent
@@ -206,25 +220,49 @@
+             }
+         }
--        Image {
--            objectName: "runningHighlight"
++        Column {
              anchors {
                  left: parent.left
                  verticalCenter: parent.verticalCenter
+             }
--            visible: root.itemRunning
--            rotation: 180
--            source: "graphics/focused_app_arrow.png"
++            spacing: units.gu(.5)
++            Repeater {
++                model: 1 // TODO: This should be "Math.min(3, app.surfaceCount)" once we have multiple surfaces
++                Rectangle {
++                    objectName: "runningHighlight" + index
++                    width: units.gu(0.25)
++                    height: units.gu(.5)
++                    color: "white"
++                    visible: root.itemRunning
++                }
++            }
+         }
--        Image {
++        Rectangle {
              objectName: "focusedHighlight"
              anchors {
                  right: parent.right
                  verticalCenter: parent.verticalCenter
+             }
++            width: units.gu(0.25)
++            height: units.gu(.5)
++            color: "white"
              visible: root.itemFocused
--            source: "graphics/focused_app_arrow.png"
++        }
++
++        Rectangle {
++            objectName: "shortcutHint"
++            anchors.centerIn: parent
++            width: units.gu(3)
++            height: width
++            color: "#E0292929"
++            visible: root.shortcutHintShown
++            Label {
++                anchors.centerIn: parent
++                text: (itemIndex + 1) % 10
++                color: "white"
++                font.weight: Font.DemiBold
++            }
+         }
+     }
 === modified file 'qml/Launcher/LauncherPanel.qml'
 --- qml/Launcher/LauncherPanel.qml	2016-01-11 17:38:19 +0000
 +++ qml/Launcher/LauncherPanel.qml	2016-02-17 16:21:55 +0000
@@ -19,12 +19,13 @@
  import Ubuntu.Components.ListItems 1.3 as ListItems
  import Unity.Launcher 0.1
  import Ubuntu.Components.Popups 1.3
++import GlobalShortcut 1.0
  import "../Components/ListItems"
  import "../Components/"
  Rectangle {
      id: root
--    color: "#B2000000"
++    color: "#E0292929"
      rotation: inverted ? 180 : 0
@@ -33,11 +34,13 @@
      property bool dragging: false
      property bool moving: launcherListView.moving || launcherListView.flicking
      property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
--                              || mouseEventEater.containsMouse || dashItem.hovered
--    property int highlightIndex: -1
++                                 || mouseEventEater.containsMouse || dashItem.hovered
++    property int highlightIndex: -2
++    property bool shortcutHintsShown: false
      signal applicationSelected(string appId)
      signal showDashHome()
++    signal kbdNavigationCancelled()
      onXChanged: {
          if (quickList.state == "open") {
@@ -45,6 +48,26 @@
+         }
+     }
++    function highlightNext() {
++        highlightIndex++;
++        if (highlightIndex >= launcherListView.count) {
++            highlightIndex = -1;
++        }
++        moveAnimation.moveToIndex(Math.max(highlightIndex, 0));
++    }
++    function highlightPrevious() {
++        highlightIndex--;
++        if (highlightIndex <= -2) {
++            highlightIndex = launcherListView.count - 1;
++        }
++        moveAnimation.moveToIndex(Math.max(highlightIndex, 0));
++    }
++    function openQuicklist(index) {
++        quickList.open(index);
++        quickList.selectedIndex = 0;
++        quickList.focus = true;
++    }
++
      MouseArea {
          id: mouseEventEater
          anchors.fill: parent
@@ -57,20 +80,12 @@
              fill: parent
+         }
--        Item {
++        Rectangle {
              objectName: "buttonShowDashHome"
              width: parent.width
              height: units.gu(7)
--            clip: true
--
--            UbuntuShape {
--                anchors {
--                    fill: parent
--                    topMargin: -units.gu(2)
--                }
--                aspect: UbuntuShape.Flat
--                backgroundColor: UbuntuColors.orange
--            }
++            color: UbuntuColors.orange
++            readonly property bool highlighted: root.highlightIndex == -1;
              Image {
                  objectName: "dashItem"
@@ -85,6 +100,14 @@
                  anchors.fill: parent
                  onClicked: root.showDashHome()
+             }
++            Rectangle {
++                objectName: "bfbFocusHighlight"
++                anchors.fill: parent
++                border.color: "white"
++                border.width: units.dp(1)
++                color: "transparent"
++                visible: parent.highlighted
++            }
+         }
          Item {
@@ -179,6 +202,16 @@
                              to = contentY;
                              start();
+                         }
++                        function moveToIndex(index) {
++                            var itemPosition = index * launcherListView.itemHeight;
++                            var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
++                            var distanceToEnd = index == 0 || index == launcherListView.count - 1 ? 0 : launcherListView.itemHeight
++                            if (itemPosition + launcherListView.itemHeight + distanceToEnd > launcherListView.contentY + launcherListView.topMargin + height) {
++                                moveAnimation.moveTo(itemPosition + launcherListView.itemHeight - launcherListView.topMargin - height + distanceToEnd);
++                            } else if (itemPosition - distanceToEnd < launcherListView.contentY + launcherListView.topMargin) {
++                                moveAnimation.moveTo(itemPosition - distanceToEnd - launcherListView.topMargin);
++                            }
++                        }
+                     }
                      displaced: Transition {
@@ -192,6 +225,7 @@
                          // the right app when running autopilot tests for
                          // multiple apps.
                          readonly property string appId: model.appId
++                        itemIndex: index
                          itemHeight: launcherListView.itemHeight
                          itemWidth: launcherListView.itemWidth
                          width: itemWidth
@@ -204,6 +238,8 @@
                          itemFocused: model.focused
                          inverted: root.inverted
                          alerting: model.alerting
++                        highlighted: root.highlightIndex == index
++                        shortcutHintShown: root.shortcutHintsShown && index <= 9
                          z: -Math.abs(offset)
                          maxAngle: 55
                          property bool dragging: false
@@ -241,14 +277,7 @@
                          onAlertingChanged: {
                              if(alerting) {
                                  if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
--                                      var itemPosition = index * launcherListView.itemHeight;
--                                      var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
--                                      var distanceToEnd = index == 0 || index == launcherListView.count - 1 ? 0 : launcherListView.itemHeight
--                                      if (itemPosition + launcherListView.itemHeight + distanceToEnd > launcherListView.contentY + launcherListView.topMargin + height) {
--                                          moveAnimation.moveTo(itemPosition + launcherListView.itemHeight - launcherListView.topMargin - height + distanceToEnd);
--                                      } else if (itemPosition - distanceToEnd < launcherListView.contentY + launcherListView.topMargin) {
--                                          moveAnimation.moveTo(itemPosition - distanceToEnd - launcherListView.topMargin);
--                                      }
++                                    moveAnimation.moveToIndex(index)
                                      if (!dragging && launcher.state !== "visible") {
                                          peekingAnimation.start()
+                                     }
@@ -402,10 +431,7 @@
                              if (mouse.button & Qt.RightButton) { // context menu
                                  // Opening QuickList
--                                quickList.item = clickedItem;
--                                quickList.model = launcherListView.model.get(index).quickList;
--                                quickList.appId = launcherListView.model.get(index).appId;
--                                quickList.state = "open";
++                                quickList.open(index);
                                  return;
+                             }
@@ -481,11 +507,7 @@
                              draggedIndex = Math.floor((mouse.y + launcherListView.realContentY) / launcherListView.realItemHeight);
--                            // Opening QuickList
--                            quickList.item = selectedItem;
--                            quickList.model = launcherListView.model.get(draggedIndex).quickList;
--                            quickList.appId = launcherListView.model.get(draggedIndex).appId;
--                            quickList.state = "open";
++                            quickList.open(draggedIndex)
                              launcherListView.interactive = false
@@ -644,7 +666,10 @@
          enabled: quickList.state == "open" || pressed
          onClicked: {
--            quickList.state = ""
++            quickList.state = "";
++            quickList.focus = false;
++            root.highlightIndex = -2;
++            root.kbdNavigationCancelled();
+         }
          // Forward for dragging to work when quickList is open
@@ -693,12 +718,55 @@
          property var model
          property string appId
          property var item
++        property int selectedIndex: -1
++
++        Keys.onPressed: {
++            switch (event.key) {
++            case Qt.Key_Down:
++                selectedIndex++;
++                if (selectedIndex >= popoverRepeater.count) {
++                    selectedIndex = 0;
++                }
++                event.accepted = true;
++                break;
++            case Qt.Key_Up:
++                selectedIndex--;
++                if (selectedIndex < 0) {
++                    selectedIndex = popoverRepeater.count - 1;
++                }
++                event.accepted = true;
++                break;
++            case Qt.Key_Left:
++            case Qt.Key_Escape:
++                quickList.selectedIndex = -1;
++                // Falling through intentionally
++            case Qt.Key_Enter:
++            case Qt.Key_Return:
++            case Qt.Key_Space:
++                if (quickList.selectedIndex >= 0) {
++                    LauncherModel.quickListActionInvoked(quickList.appId, quickList.selectedIndex)
++                }
++                quickList.focus = false;
++                quickList.state = ""
++                // Don't consume the event. We want to close the Launcher too, not just the quicklist.
++                break;
++            }
++        }
          // internal
          property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) + quickList.item.offset : units.gu(1)
          property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
                               itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
++        function open(index) {
++            var itemPosition = index * launcherListView.itemHeight;
++            var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
++            item = launcherListView.itemAt(launcherListView.width / 2, itemPosition + launcherListView.itemHeight / 2);
++            quickList.model = launcherListView.model.get(index).quickList;
++            quickList.appId = launcherListView.model.get(index).appId;
++            quickList.state = "open";
++        }
++
          Column {
              id: quickListColumn
              width: parent.width
@@ -712,6 +780,7 @@
                      objectName: "quickListEntry" + index
                      text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
                      highlightWhenPressed: model.clickable
++                    selected: index === quickList.selectedIndex
                      // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
                      // ListItems don't know that they are sitting in a themed Popover where the color
@@ -727,6 +796,8 @@
                          // Unsetting model to prevent showing changing entries during fading out
                          // that may happen because of triggering an action.
                          LauncherModel.quickListActionInvoked(quickList.appId, index);
++                        quickList.focus = false;
++                        root.kbdNavigationCancelled();
                          quickList.model = undefined;
+                     }
+                 }
 === added file 'qml/Launcher/graphics/launcher-app-focus-ring.svg'
 --- qml/Launcher/graphics/launcher-app-focus-ring.svg	1970-01-01 00:00:00 +0000
 +++ qml/Launcher/graphics/launcher-app-focus-ring.svg	2016-02-17 16:21:55 +0000
@@ -0,0 +1,12 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<svg width="172px" height="163px" viewBox="0 0 172 163" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
++    <!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
++    <title>Shape</title>
++    <desc>Created with Sketch.</desc>
++    <defs></defs>
++    <g id="•-Launcher" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
++        <g id="Artboard-9" sketch:type="MSArtboardGroup" transform="translate(-163.000000, -1436.000000)" fill="#E95420">
++            <path d="M221.983432,1440 L221.983432,1440 C195.6127,1440 184.708233,1442.4723 177.107949,1450.10734 C169.476819,1457.77336 167,1468.79245 167,1495.3481 L167,1538.9019 C167,1565.45755 169.476819,1576.47664 177.107949,1584.14266 C184.708233,1591.7777 195.6127,1594.25 221.983432,1594.25 L276.016868,1594.25 C302.387595,1594.25 313.291998,1591.77771 320.892221,1584.14264 C328.523252,1576.47663 331,1565.45769 331,1538.9019 L331,1495.3481 C331,1468.79231 328.523252,1457.77337 320.892221,1450.10736 C313.291998,1442.47229 302.387595,1440 276.016868,1440 L221.983432,1440 Z M221.983432,1436 L276.016868,1436 C302.345315,1436 314.848953,1438.36655 323.727108,1447.2854 C332.633306,1456.23243 335,1468.85167 335,1495.3481 L335,1538.9019 C335,1565.39833 332.633306,1578.01757 323.727108,1586.9646 C314.848953,1595.88345 302.345315,1598.25 276.016868,1598.25 L221.983432,1598.25 C195.654985,1598.25 183.151291,1595.88345 174.273077,1586.96463 C165.366772,1578.0176 163,1565.39822 163,1538.9019 L163,1495.3481 C163,1468.85178 165.366772,1456.2324 174.273077,1447.28537 C183.151291,1438.36655 195.654985,1436 221.983432,1436 L221.983432,1436 Z" id="Shape" sketch:type="MSShapeGroup"></path>
++        </g>
++    </g>
++</svg>
 \ No newline at end of file
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-01-28 18:25:14 +0000
 +++ qml/Shell.qml	2016-02-17 16:21:55 +0000
@@ -557,6 +557,8 @@
                      && !greeter.hasLockedApp
              inverted: shell.usageScenario !== "desktop"
              shadeBackground: !tutorial.running
++            superPressed: physicalKeysMapper.superPressed
++            superTabPressed: physicalKeysMapper.superTabPressed
              onShowDashHome: showHome()
              onDash: showDash()
@@ -576,6 +578,37 @@
                      panel.indicators.hide()
+                 }
+             }
++            onFocusChanged: {
++                if (!focus) {
++                    applicationsDisplayLoader.focus = true;
++                }
++            }
++
++            GlobalShortcut {
++                shortcut: Qt.AltModifier | Qt.Key_F1
++                onTriggered: {
++                    launcher.openForKeyboardNavigation();
++                }
++            }
++            GlobalShortcut {
++                shortcut: Qt.MetaModifier | Qt.Key_0
++                onTriggered: {
++                    if (LauncherModel.get(9)) {
++                        activateApplication(LauncherModel.get(9).appId);
++                    }
++                }
++            }
++            Repeater {
++                model: 9
++                GlobalShortcut {
++                    shortcut: Qt.MetaModifier | (Qt.Key_1 + index)
++                    onTriggered: {
++                        if (LauncherModel.get(index)) {
++                            activateApplication(LauncherModel.get(index).appId);
++                        }
++                    }
++                }
++            }
+         }
          Wizard {
 === modified file 'qml/Stages/ApplicationWindow.qml'
 --- qml/Stages/ApplicationWindow.qml	2016-02-12 00:10:54 +0000
 +++ qml/Stages/ApplicationWindow.qml	2016-02-17 16:21:55 +0000
@@ -44,6 +44,14 @@
      readonly property int widthIncrement: sessionContainer.surface ? sessionContainer.surface.widthIncrement : 0
      readonly property int heightIncrement: sessionContainer.surface ? sessionContainer.surface.heightIncrement : 0
++    function nextKeymap() {
++        sessionContainer.surfaceContainer.nextKeymap();
++    }
++
++    function previousKeymap() {
++        sessionContainer.surfaceContainer.previousKeymap();
++    }
++
      QtObject {
          id: d
 === modified file 'qml/Stages/DecoratedWindow.qml'
 --- qml/Stages/DecoratedWindow.qml	2015-11-30 18:25:47 +0000
 +++ qml/Stages/DecoratedWindow.qml	2016-02-17 16:21:55 +0000
@@ -51,6 +51,14 @@
      signal minimize()
      signal decorationPressed()
++    function nextKeymap() {
++        applicationWindow.nextKeymap();
++    }
++
++    function previousKeymap() {
++        applicationWindow.previousKeymap();
++    }
++
      Rectangle {
          id: selectionHighlight
          anchors.fill: parent
 === modified file 'qml/Stages/DesktopSpread.qml'
 --- qml/Stages/DesktopSpread.qml	2015-11-24 17:44:18 +0000
 +++ qml/Stages/DesktopSpread.qml	2016-02-17 16:21:55 +0000
@@ -19,6 +19,7 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  import Unity.Application 0.1
++import "../Components"
  FocusScope {
      id: root
@@ -26,8 +27,11 @@
      property bool altTabPressed: false
      property Item workspace: null
++    readonly property alias ready: blurLayer.ready
      readonly property alias highlightedIndex: spreadRepeater.highlightedIndex
++    signal playFocusAnimation(int index)
++
      function show() {
          spreadContainer.animateIn = true;
          root.state = "altTab";
@@ -91,6 +95,9 @@
      function focusSelected() {
          if (spreadRepeater.highlightedIndex != -1) {
++            if (spreadContainer.visible) {
++                root.playFocusAnimation(spreadRepeater.highlightedIndex)
++            }
              var application = ApplicationManager.get(spreadRepeater.highlightedIndex);
              ApplicationManager.requestFocusApplication(application.appId);
+         }
@@ -101,6 +108,31 @@
          state = ""
+     }
++    BlurLayer {
++        id: blurLayer
++        anchors.fill: parent
++        source: root.workspace
++        visible: false
++    }
++
++    Rectangle {
++        id: spreadBackground
++        anchors.fill: parent
++        color: "#B2000000"
++        visible: false
++        opacity: visible ? 1 : 0
++        Behavior on opacity {
++            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++        }
++    }
++
++    MouseArea {
++        id: eventEater
++        anchors.fill: parent
++        visible: spreadBackground.visible
++        enabled: visible
++    }
++
      Item {
          id: spreadContainer
          objectName: "spreadContainer"
@@ -226,13 +258,20 @@
                      Transition {
                          from: ""
                          to: "altTab"
--                        PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
--                        PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
--                        PropertyAnimation {
--                            target: spreadDelegate; properties: "x"
--                            from: root.width
--                            duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
--                            easing: UbuntuAnimation.StandardEasing
++                        SequentialAnimation {
++                            ParallelAnimation {
++                                PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
++                                PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
++                                PropertyAnimation {
++                                    target: spreadDelegate; properties: "x"
++                                    from: root.width
++                                    duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
++                                    easing: UbuntuAnimation.StandardEasing
++                                }
++                                UbuntuNumberAnimation { target: clippedSpreadDelegate; property: "shadowOpacity"; from: 0; to: spreadMaths.shadowOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
++                                UbuntuNumberAnimation { target: tileInfo; property: "opacity"; from: 0; to: spreadMaths.tileInfoOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
++                            }
++                            PropertyAction { target: spreadSelectArea; property: "enabled" }
+                         }
+                     }
+                 ]
@@ -262,12 +301,20 @@
                          anchors { left: parent.left; top: parent.top; right: parent.right }
                          spacing: units.gu(1)
--                        UbuntuShape {
++                        UbuntuShapeForItem {
                              Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
                              Layout.preferredWidth: height * 8 / 7.6
                              image: Image {
                                  anchors.fill: parent
                                  source: model.icon
++                                Rectangle {
++                                    anchors.fill: parent
++                                    color: "black"
++                                    opacity: clippedSpreadDelegate.highlightShown ? 0 : .1
++                                    Behavior on opacity {
++                                        UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++                                    }
++                                }
+                             }
+                         }
                          Label {
@@ -420,7 +467,7 @@
                              property var source: ShaderEffectSource {
                                  id: shaderEffectSource
--                                sourceItem: appContainer
++                                sourceItem: root.workspace
+                             }
                              fragmentShader: "
@@ -494,20 +541,17 @@
              from: "*"
              to: "altTab"
              SequentialAnimation {
--                PropertyAction { target: hoverMouseArea; property: "progressiveScrollingEnabled"; value: false }
                  PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(ApplicationManager.count - 1, 1) }
--                PauseAnimation { duration: 140 }
++                PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
                  PropertyAction { target: workspaceSelector; property: "visible" }
                  PropertyAction { target: spreadContainer; property: "visible" }
                  ParallelAnimation {
--                    UbuntuNumberAnimation {
--                        target: blurLayer; properties: "saturation,blurRadius";
--                        duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0
--                    }
++                    UbuntuNumberAnimation { target: blurLayer; properties: "saturation,blurRadius"; duration: UbuntuAnimation.SnapDuration }
                      PropertyAction { target: spreadFlickable; property: "visible" }
                      PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
                      PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
+                 }
++                PropertyAction { target: hoverMouseArea; properties: "enabled,progressiveScrollingEnabled"; value: false }
+             }
          },
          Transition {
@@ -518,6 +562,5 @@
              PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: -1 }
              PropertyAction { target: spreadContainer; property: "animateIn"; value: false }
+         }
--
+     ]
+ }
 === modified file 'qml/Stages/DesktopSpreadDelegate.qml'
 --- qml/Stages/DesktopSpreadDelegate.qml	2015-12-01 12:17:24 +0000
 +++ qml/Stages/DesktopSpreadDelegate.qml	2016-02-17 16:21:55 +0000
@@ -56,6 +56,11 @@
+         }
+     ]
++    scale: highlightShown ? 1.025 : 1
++    Behavior on scale {
++        UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++    }
++
      BorderImage {
          anchors {
              fill: root
@@ -70,7 +75,7 @@
          anchors.fill: parent
          anchors.margins: -units.gu(1)
          color: "white"
--        opacity: highlightShown ? 0.15 : 0
++        opacity: highlightShown ? 0.55 : 0
          antialiasing: true
+     }
@@ -108,4 +113,13 @@
+             ]
+         }
+     }
++
++    Rectangle {
++        anchors.fill: parent
++        color: "black"
++        opacity: root.highlightShown ? 0 : .1
++        Behavior on opacity {
++            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++        }
++    }
+ }
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-02-03 14:00:47 +0000
 +++ qml/Stages/DesktopStage.qml	2016-02-17 16:21:55 +0000
@@ -22,6 +22,7 @@
  import Utils 0.1
  import Ubuntu.Gestures 0.1
  import GlobalShortcut 1.0
++import AccountsService 0.1
  AbstractStage {
      id: root
@@ -118,6 +119,18 @@
          active: priv.focusedAppDelegate !== null
+     }
++    GlobalShortcut {
++        shortcut: Qt.MetaModifier|Qt.Key_Space
++        onTriggered: priv.focusedAppDelegate.nextKeymap()
++        active: priv.focusedAppDelegate !== null
++    }
++
++    GlobalShortcut {
++        shortcut: Qt.MetaModifier|Qt.ShiftModifier|Qt.Key_Space
++        onTriggered: priv.focusedAppDelegate.previousKeymap()
++        active: priv.focusedAppDelegate !== null
++    }
++
      QtObject {
          id: priv
@@ -348,6 +361,27 @@
                      ApplicationManager.focusApplication(appId);
+                 }
++                function nextKeymap() {
++                    decoratedWindow.nextKeymap();
++                }
++
++                function previousKeymap() {
++                    decoratedWindow.previousKeymap();
++                }
++
++                function playFocusAnimation() {
++                    focusAnimation.start()
++                }
++
++                UbuntuNumberAnimation {
++                    id: focusAnimation
++                    target: appDelegate
++                    property: "scale"
++                    from: 0.98
++                    to: 1
++                    duration: UbuntuAnimation.SnapDuration
++                }
++
                  states: [
                      State {
                          name: "fullscreen"; when: decoratedWindow.fullscreen
@@ -438,7 +472,7 @@
                      target: appDelegate
                      property: "z"
                      value: ApplicationManager.count + 1
--                    when: index == spread.highlightedIndex && blurLayer.ready
++                    when: index == spread.highlightedIndex && spread.ready
+                 }
                  WindowResizeArea {
@@ -473,27 +507,6 @@
+         }
+     }
--    BlurLayer {
--        id: blurLayer
--        anchors.fill: parent
--        source: appContainer
--        visible: false
--    }
--
--    Rectangle {
--        id: spreadBackground
--        anchors.fill: parent
--        color: "#55000000"
--        visible: false
--    }
--
--    MouseArea {
--        id: eventEater
--        anchors.fill: parent
--        visible: spreadBackground.visible
--        enabled: visible
--    }
--
      EdgeBarrier {
          id: edgeBarrier
@@ -509,7 +522,7 @@
                      rotation: 90
                      anchors.centerIn: parent
                      gradient: Gradient {
--                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
++                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.5)}
                          GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
+                     }
+                 }
@@ -531,5 +544,9 @@
          workspace: appContainer
          focus: state == "altTab"
          altTabPressed: root.altTabPressed
++
++        onPlayFocusAnimation: {
++            appRepeater.itemAt(index).playFocusAnimation();
++        }
+     }
+ }
 === modified file 'qml/Stages/SurfaceContainer.qml'
 --- qml/Stages/SurfaceContainer.qml	2015-11-30 12:18:40 +0000
 +++ qml/Stages/SurfaceContainer.qml	2016-02-17 16:21:55 +0000
@@ -19,6 +19,7 @@
  import Ubuntu.Gestures 0.1 // For TouchGate
  import Utils 0.1 // for InputWatcher
  import Unity.Application 0.1 // for MirSurfaceItem
++import AccountsService 0.1
  FocusScope {
      id: root
@@ -34,11 +35,45 @@
      property int requestedWidth: -1
      property int requestedHeight: -1
++    readonly property var keymaps: AccountsService.keymaps
++    property string currentKeymap: AccountsService.keymaps[0]
++
      onSurfaceChanged: {
          if (surface) {
              surfaceItem.surface = surface;
              root.hadSurface = false;
--        }
++
++            var keymap = currentKeymap.split("+")
++            surface.setKeymap(keymap[0], keymap[1] || "")
++        }
++    }
++
++    function nextKeymap() {
++        var currentIndex = keymaps.indexOf(currentKeymap);
++        var nextIndex = 0;
++
++        if (currentIndex !== -1 && currentIndex < keymaps.length - 1) {
++            nextIndex = currentIndex + 1;
++        }
++
++        currentKeymap = keymaps[nextIndex];
++        var keymap = currentKeymap.split("+");
++
++        surface.setKeymap(keymap[0], keymap[1] || "");
++    }
++
++    function previousKeymap() {
++        var currentIndex = keymaps.indexOf(currentKeymap);
++        var prevIndex = keymaps.length - 1;
++
++        if (currentIndex > 0) {
++            prevIndex = currentIndex - 1;
++        }
++
++        currentKeymap = keymaps[prevIndex];
++        var keymap = currentKeymap.split("+");
++
++        surface.setKeymap(keymap[0], keymap[1] || "");
+     }
      InputWatcher {
 === modified file 'tests/mocks/AccountsService/AccountsService.cpp'
 --- tests/mocks/AccountsService/AccountsService.cpp	2015-09-22 10:44:21 +0000
 +++ tests/mocks/AccountsService/AccountsService.cpp	2016-02-17 16:21:55 +0000
@@ -152,3 +152,20 @@
+ {
      return !m_hereLicensePath.isNull();
+ }
++
++QStringList AccountsService::keymaps() const
++{
++    if (!m_kbdMap.isEmpty()) {
++        return m_kbdMap;
++    }
++
++    return {QStringLiteral("us")};
++}
++
++void AccountsService::setKeymaps(const QStringList &keymaps)
++{
++    if (keymaps != m_kbdMap) {
++        m_kbdMap = keymaps;
++        Q_EMIT keymapsChanged();
++    }
++}
 === modified file 'tests/mocks/AccountsService/AccountsService.h'
 --- tests/mocks/AccountsService/AccountsService.h	2014-11-24 17:42:36 +0000
 +++ tests/mocks/AccountsService/AccountsService.h	2016-02-17 16:21:55 +0000
@@ -70,6 +70,10 @@
      Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
                 READ hereLicensePathValid
                 NOTIFY hereLicensePathChanged)
++    Q_PROPERTY(QStringList keymaps
++               READ keymaps
++               WRITE setKeymaps // only in mock
++               NOTIFY keymapsChanged)
  public:
      enum PasswordDisplayHint {
@@ -99,6 +103,8 @@
      QString hereLicensePath() const;
      void setHereLicensePath(const QString &path);
      bool hereLicensePathValid() const;
++    QStringList keymaps() const;
++    void setKeymaps(const QStringList &keymaps);
  Q_SIGNALS:
      void userChanged();
@@ -111,6 +117,7 @@
      void failedLoginsChanged();
      void hereEnabledChanged();
      void hereLicensePathChanged();
++    void keymapsChanged();
  private:
      bool m_enableLauncherWhileLocked;
@@ -122,6 +129,7 @@
      bool m_demoEdges;
      bool m_hereEnabled;
      QString m_hereLicensePath;
++    QStringList m_kbdMap;
  };
  #endif
 === modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2015-11-30 18:25:47 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	2016-02-17 16:21:55 +0000
@@ -129,7 +129,21 @@
      Q_EMIT orientationAngleChanged(angle);
+ }
--
++QString MirSurface::keymapLayout() const
++{
++    return m_keyMap.first;
++}
++
++QString MirSurface::keymapVariant() const
++{
++    return m_keyMap.second;
++}
++
++void MirSurface::setKeymap(const QString &layout, const QString &variant)
++{
++    m_keyMap = qMakePair(layout, variant);
++    Q_EMIT keymapChanged(layout, variant);
++}
  void MirSurface::registerView(qintptr viewId)
+ {
 === modified file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2015-11-30 18:25:47 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	2016-02-17 16:21:55 +0000
@@ -73,6 +73,10 @@
      int widthIncrement() const override { return m_widthIncrement; }
      int heightIncrement() const override { return m_heightIncrement; }
++    QString keymapLayout() const override;
++    QString keymapVariant() const override;
++    Q_INVOKABLE void setKeymap(const QString &layout, const QString &variant) override;
++
      ////
      // API for tests
@@ -155,6 +159,8 @@
          bool visible;
      };
      QHash<qintptr, View> m_views;
++
++    QPair<QString,QString> m_keyMap; // pair of layout+variant
  };
  #endif // MOCK_MIR_SURFACE_H
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-11-04 11:29:16 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2016-02-17 16:21:55 +0000
@@ -25,6 +25,7 @@
      MockLauncherItem *item = new MockLauncherItem("dialer-app", "/usr/share/applications/dialer-app.desktop", "Dialer", "dialer-app", this);
      item->setProgress(0);
      item->setPinned(true);
++    item->setRunning(true);
      item->setFocused(true);
      m_list.append(item);
      item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);
@@ -34,6 +35,7 @@
      item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
      item->setProgress(50);
      item->setCountVisible(true);
++    item->setRunning(true);
      item->setAlerting(false);
      m_list.append(item);
      item = new MockLauncherItem("music-app", "/usr/share/applications/music-app.desktop", "Music", "soundcloud", this);
 === modified file 'tests/plugins/AccountsService/PropertiesServer.cpp'
 --- tests/plugins/AccountsService/PropertiesServer.cpp	2015-10-26 14:05:14 +0000
 +++ tests/plugins/AccountsService/PropertiesServer.cpp	2016-02-17 16:21:55 +0000
@@ -25,10 +25,16 @@
  #include <QDBusMessage>
  #include <QDBusMetaType>
++using StringMap = QMap<QString,QString>;
++using StringMapList = QList<StringMap>;
++Q_DECLARE_METATYPE(StringMapList)
++
  PropertiesServer::PropertiesServer(QObject *parent)
      : QObject(parent)
+ {
      qDBusRegisterMetaType<QList<QVariantMap>>();
++    qDBusRegisterMetaType<StringMap>();
++    qDBusRegisterMetaType<StringMapList>();
      Reset();
+ }
@@ -53,12 +59,14 @@
              if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&
                      property == QStringLiteral("LauncherItems")) {
                  newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));
++            } else if (interface == "org.freedesktop.Accounts.User" && property == "InputSources") {
++                newValue = QVariant::fromValue(qdbus_cast<StringMapList>(newValue.value<QDBusArgument>()));
+             }
              oldValue = newValue;
              // Special case for Background file.
--            if (interface == "org.freedesktop.Accounts.User" && property == "BackgroundFile") {
++            if (interface == "org.freedesktop.Accounts.User" && (property == "BackgroundFile" || property == "InputSources")) {
                  Q_EMIT Changed();
              } else {
                  QVariantMap propertyChanges;
@@ -88,4 +96,5 @@
      m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseAccepted"] = false;
      m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";
      m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";
++    m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());
+ }
 === modified file 'tests/plugins/AccountsService/PropertiesServer.h'
 --- tests/plugins/AccountsService/PropertiesServer.h	2015-04-17 16:39:43 +0000
 +++ tests/plugins/AccountsService/PropertiesServer.h	2016-02-17 16:21:55 +0000
@@ -20,7 +20,6 @@
  #ifndef UNITY_PROPERTIESSERVER_H
  #define UNITY_PROPERTIESSERVER_H
--#include "PropertiesServer.h"
  #include <QDBusContext>
  #include <QDBusVariant>
  #include <QObject>
 === modified file 'tests/plugins/AccountsService/client.cpp'
 --- tests/plugins/AccountsService/client.cpp	2015-10-26 14:05:14 +0000
 +++ tests/plugins/AccountsService/client.cpp	2016-02-17 16:21:55 +0000
@@ -23,6 +23,11 @@
  #include <QTest>
  #include <QDebug>
  #include <QDBusReply>
++#include <QDBusMetaType>
++
++using StringMap = QMap<QString,QString>;
++using StringMapList = QList<StringMap>;
++Q_DECLARE_METATYPE(StringMapList)
  template <class T>
  QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }
@@ -43,6 +48,8 @@
          , m_userInterface(nullptr)
          , m_spy(this, &AccountsServiceTest::propertiesChanged)
+     {
++        qDBusRegisterMetaType<StringMap>();
++        qDBusRegisterMetaType<StringMapList>();
+     }
  private Q_SLOTS:
@@ -215,6 +222,28 @@
          QTRY_COMPARE(session.backgroundFile(), QString("/test/BackgroundFile"));
+     }
++    void testAsynchronousChangeForKeymaps()
++    {
++        AccountsService session(this, QTest::currentTestFunction());
++
++        QCOMPARE(session.keymaps(), {"us"});
++
++        StringMapList inputSources;
++        StringMap map1;
++        map1.insert("xkb", "cz+qwerty");
++        inputSources.append(map1);
++        StringMap map2;
++        map2.insert("xkb", "fr");
++        inputSources.append(map2);
++
++        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
++                                                    "org.freedesktop.Accounts.User",
++                                                    "InputSources",
++                                                    QVariant::fromValue(QDBusVariant(QVariant::fromValue(inputSources)))));
++        QStringList result = {"cz+qwerty", "fr"};
++        QTRY_COMPARE(session.keymaps(), result);
++    }
++
  Q_SIGNALS:
      void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
 === modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
 --- tests/qmltests/Launcher/tst_Launcher.qml	2016-01-19 15:36:15 +0000
 +++ tests/qmltests/Launcher/tst_Launcher.qml	2016-02-17 16:21:55 +0000
@@ -34,6 +34,7 @@
      Loader {
          id: launcherLoader
          anchors.fill: parent
++        focus: true
          property bool itemDestroyed: false
          sourceComponent: Component {
              Launcher {
@@ -68,6 +69,7 @@
                  Component.onCompleted: {
                      launcherLoader.itemDestroyed = false;
++                    launcherLoader.focus = true
                      edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");
+                 }
                  Component.onDestruction: {
@@ -102,6 +104,15 @@
              Layout.fillWidth: true
+         }
++        Button {
++            text: "open for kbd navigation"
++            onClicked: {
++                launcherLoader.item.openForKeyboardNavigation()
++                launcherLoader.item.forceActiveFocus();// = true
++            }
++            Layout.fillWidth: true
++        }
++
          Row {
              spacing: units.gu(1)
@@ -276,6 +287,18 @@
+             }
+         }
++        function assertFocusOnIndex(index) {
++            var launcherListView = findChild(launcher, "launcherListView");
++            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
++
++            waitForRendering(launcher);
++            tryCompare(bfbFocusHighlight, "visible", index === -1);
++            for (var i = 0; i < launcherListView.count; i++) {
++                var focusRing = findChild(findChild(launcher, "launcherDelegate" + i), "focusRing")
++                tryCompare(focusRing, "visible", index === i);
++            }
++        }
++
          // Drag from the left edge of the screen rightwards and check that the launcher
          // appears (as if being dragged by the finger/pointer)
          function test_dragLeftEdgeToRevealLauncherAndTapCenterToDismiss() {
@@ -290,10 +313,10 @@
              dragLauncherIntoView()
              // tapping on the center of the screen should dismiss the launcher
--            mouseClick(launcher)
++            mouseClick(launcher, panel.width + units.gu(5), launcher.height / 2)
              // should eventually get fully retracted (hidden)
--            tryCompare(panel, "x", -launcher.panelWidth, 1000)
++            tryCompare(panel, "x", -launcher.panelWidth, 2000)
+         }
          /* If I click on the icon of an application on the launcher
@@ -421,7 +444,7 @@
              var launcherListView = findChild(launcher, "launcherListView");
              for (var i = 0; i < launcherListView.count; ++i) {
                  var delegate = findChild(launcherListView, "launcherDelegate" + i)
--                compare(findChild(delegate, "runningHighlight").visible, LauncherModel.get(i).running)
++                compare(findChild(delegate, "runningHighlight0").visible, LauncherModel.get(i).running)
+             }
+         }
@@ -764,14 +787,15 @@
          function test_launcher_dismiss() {
              dragLauncherIntoView();
              verify(launcher.state == "visible");
--            mouseClick(root);
++
++            mouseClick(root, root.width / 2, units.gu(1));
              waitUntilLauncherDisappears();
              verify(launcher.state == "");
              // and repeat, as a test for regression in lpbug#1531339
              dragLauncherIntoView();
              verify(launcher.state == "visible");
--            mouseClick(root);
++            mouseClick(root, root.width / 2, units.gu(1));
              waitUntilLauncherDisappears();
              verify(launcher.state == "");
+         }
@@ -1044,5 +1068,123 @@
              LauncherModel.setCountVisible(LauncherModel.get(1).appId, 0)
              LauncherModel.setCount(LauncherModel.get(1).appId, oldCount)
+         }
++
++        function test_longpressSuperKeyShowsHints() {
++            var shortCutHint0 = findChild(findChild(launcher, "launcherDelegate0"), "shortcutHint");
++
++            tryCompare(shortCutHint0, "visible", false);
++
++            launcher.superPressed = true;
++            tryCompare(launcher, "state", "visible");
++            tryCompare(shortCutHint0, "visible", true);
++
++            launcher.superPressed = false;
++            tryCompare(launcher, "state", "");
++            tryCompare(shortCutHint0, "visible", false);
++        }
++
++        function test_keyboardNavigation() {
++            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
++            var quickList = findChild(launcher, "quickList");
++            var launcherListView = findChild(launcher, "launcherListView");
++            var last = launcherListView.count - 1;
++
++            compare(bfbFocusHighlight.visible, false);
++
++            launcher.openForKeyboardNavigation();
++
++            assertFocusOnIndex(-1);
++
++            // Down should go down
++            keyClick(Qt.Key_Down);
++            assertFocusOnIndex(0);
++
++            // Tab should go down
++            keyClick(Qt.Key_Tab);
++            assertFocusOnIndex(1);
++
++            // Up should go up
++            keyClick(Qt.Key_Up);
++            assertFocusOnIndex(0);
++
++            // Backtab should go up
++            keyClick(Qt.Key_Backtab);
++            assertFocusOnIndex(-1); // BFB
++
++            // The list should wrap around
++            keyClick(Qt.Key_Up);
++            assertFocusOnIndex(last);
++
++            keyClick(Qt.Key_Down);
++            waitForRendering(launcher);
++            keyClick(Qt.Key_Down);
++            assertFocusOnIndex(0); // Back to Top
++
++            // Right opens the quicklist
++            keyClick(Qt.Key_Right);
++            assertFocusOnIndex(0); // Navigating the quicklist... the launcher focus should not move
++            tryCompare(quickList, "visible", true);
++            tryCompare(quickList, "selectedIndex", 0)
++
++            // Down should move down the quicklist
++            keyClick(Qt.Key_Down);
++            tryCompare(quickList, "selectedIndex", 1)
++
++            // The quicklist should wrap around too
++            keyClick(Qt.Key_Down);
++            keyClick(Qt.Key_Down);
++            keyClick(Qt.Key_Down);
++            tryCompare(quickList, "selectedIndex", 0)
++
++            // Left gets us back to the launcher
++            keyClick(Qt.Key_Left);
++            assertFocusOnIndex(0);
++            tryCompare(quickList, "visible", false);
++
++            // Launcher navigation should still work
++            // Go bar to top by wrapping around
++            keyClick(Qt.Key_Down);
++            assertFocusOnIndex(1);
++        }
++
++        function test_selectQuicklistItemByKeyboard() {
++            launcher.openForKeyboardNavigation();
++            waitForRendering(launcher);
++
++            signalSpy.clear();
++            signalSpy.signalName = "quickListTriggered"
++
++            keyClick(Qt.Key_Down); // Down to launcher item 0
++            keyClick(Qt.Key_Down); // Down to launcher item 1
++            keyClick(Qt.Key_Right); // Into quicklist
++            keyClick(Qt.Key_Down); // Down to quicklist item 1
++            keyClick(Qt.Key_Down); // Down to quicklist item 2
++            keyClick(Qt.Key_Enter); // Trigger it
++
++            compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
++            compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)
++            compare(signalSpy.signalArguments[0][1], 2)
++        }
++
++        function test_cancelKbdNavigationWitMouse() {
++            launcher.openForKeyboardNavigation();
++            waitForRendering(launcher);
++            var launcherPanel = findChild(launcher, "launcherPanel");
++            tryCompare(launcherPanel, "x", 0);
++
++            var quickList = findChild(launcher, "quickList");
++
++            keyClick(Qt.Key_Down); // Down to launcher item 0
++            keyClick(Qt.Key_Down); // Down to launcher item 1
++            keyClick(Qt.Key_Right); // Into quicklist
++
++            waitForRendering(launcher)
++            tryCompare(quickList, "visible", true)
++
++            mouseClick(root, root.width / 2, units.gu(2));
++
++            tryCompare(launcher, "state", "");
++            tryCompare(launcherPanel, "highlightIndex", -2);
++        }
+     }
+ }
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2016-02-03 14:00:47 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-02-17 16:21:55 +0000
@@ -21,6 +21,7 @@
  import Unity.Application 0.1
  import Unity.Test 0.1
  import Utils 0.1
++import AccountsService 0.1
  import ".." // For EdgeBarrierControls
  import "../../../qml/Stages"
@@ -65,8 +66,9 @@
          property bool itemDestroyed: false
          sourceComponent: Component {
              DesktopStage {
--                color: "darkblue"
++                color: "white"
                  anchors.fill: parent
++                background: "../../../qml/graphics/tablet_background.jpg"
                  Component.onCompleted: {
                      edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");
@@ -509,8 +511,6 @@
+         }
          function test_dropShadow() {
--            killAllRunningApps();
--
              // verify the drop shadow is not visible initially
              verify(PanelState.dropShadow == false);
@@ -535,5 +535,31 @@
              // verify the drop shadow is gone
              verify(PanelState.dropShadow == false);
+         }
++
++        function test_switchKeymap() {
++            AccountsService.keymaps = ["cz+qwerty", "fr", "us"] // "configure" the keymaps for user
++
++            var facebookApp = startApplication("facebook-webapp");
++            var appSurface = facebookApp.session.lastSurface;
++            verify(appSurface);
++
++            // verify the initial keymap is the first one from the list
++            tryCompare(appSurface, "keymapLayout", AccountsService.keymaps[0].split("+")[0]); // cz
++            tryCompare(appSurface, "keymapVariant", AccountsService.keymaps[0].split("+")[1]); // qwerty
++
++            // switch to next keymap
++            keyClick(Qt.Key_Space, Qt.MetaModifier);
++            // the keymap should now be "fr"
++            var frKeymap = AccountsService.keymaps[1].split("+");
++            tryCompare(appSurface, "keymapLayout", frKeymap[0]); // fr
++            tryCompare(appSurface, "keymapVariant", "");
++
++            // switch twice backwards, should be "us" keyboard now, the switching wraps around
++            keyClick(Qt.Key_Space, Qt.MetaModifier|Qt.ShiftModifier);
++            keyClick(Qt.Key_Space, Qt.MetaModifier|Qt.ShiftModifier);
++            var usKeymap = AccountsService.keymaps[2].split("+");
++            tryCompare(appSurface, "keymapLayout", usKeymap[0]); // us
++            tryCompare(appSurface, "keymapVariant", "");
++        }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-02-12 00:11:28 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-02-17 16:21:55 +0000
@@ -26,6 +26,7 @@
  import Unity.Connectivity 0.1
  import Unity.Indicators 0.1
  import Unity.Notifications 1.0
++import Unity.Launcher 0.1
  import Unity.Test 0.1
  import Powerd 0.1
  import Wizard 0.1 as Wizard
@@ -121,10 +122,6 @@
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true;
+                     }
--                    Component.onCompleted: {
--                        var keyMapper = testCase.findChild(__shell, "physicalKeysMapper");
--                        keyMapper.controlInsteadOfAlt = true;
--                    }
+                 }
+             }
+         }
@@ -213,6 +210,18 @@
                      checked: true
                      color: "white"
+                 }
++                ListItem.ItemSelector {
++                    id: ctrlModifier
++                    anchors { left: parent.left; right: parent.right }
++                    activeFocusOnPress: false
++                    text: "Ctrl key as"
++                    model: ["Ctrl", "Alt", "Super"]
++                    onSelectedIndexChanged: {
++                        var keyMapper = testCase.findChild(shellContainer, "physicalKeysMapper");
++                        keyMapper.controlInsteadOfAlt = selectedIndex == 1;
++                        keyMapper.controlInsteadOfSuper = selectedIndex == 2;
++                    }
++                }
                  Label { text: "Applications"; font.bold: true }
@@ -1441,7 +1450,7 @@
              // Do a quick alt-tab and see if focus changes
              tryCompare(app3.session.lastSurface, "activeFocus", true)
--            keyClick(Qt.Key_Tab, Qt.ControlModifier)
++            keyClick(Qt.Key_Tab, Qt.AltModifier)
              tryCompare(app2.session.lastSurface, "activeFocus", true)
              var desktopSpread = findChild(shell, "spread")
@@ -1449,12 +1458,12 @@
              tryCompare(desktopSpread, "state", "")
              // Just press Alt, make sure the spread comes up
--            keyPress(Qt.Key_Control);
++            keyPress(Qt.Key_Alt);
              keyClick(Qt.Key_Tab);
              tryCompare(desktopSpread, "state", "altTab")
              // Release control, check if spread disappears
--            keyRelease(Qt.Key_Control)
++            keyRelease(Qt.Key_Alt)
              tryCompare(desktopSpread, "state", "")
              // Focus should have switched back now
@@ -1482,7 +1491,7 @@
              tryCompare(desktopSpread, "state", "")
              // Just press Alt, make sure the spread comes up
--            keyPress(Qt.Key_Control);
++            keyPress(Qt.Key_Alt);
              keyClick(Qt.Key_Tab);
              tryCompare(desktopSpread, "state", "altTab")
              tryCompare(spreadRepeater, "highlightedIndex", 1)
@@ -1503,7 +1512,7 @@
              tryCompare(spreadRepeater, "highlightedIndex", 0)
              // Release control, check if spread disappears
--            keyRelease(Qt.Key_Control)
++            keyRelease(Qt.Key_Alt)
              tryCompare(desktopSpread, "state", "")
              // Make sure that after wrapping around once, we have the same one focused as at the beginning
@@ -1516,7 +1525,7 @@
              var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
              verify(spreadRepeater !== null);
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1538,7 +1547,7 @@
              keyClick(Qt.Key_Backtab);
              tryCompare(spreadRepeater, "highlightedIndex", 1);
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          function test_highlightFollowsMouse() {
@@ -1547,7 +1556,7 @@
              var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
              verify(spreadRepeater !== null);
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1566,7 +1575,7 @@
              verify(y < 4000);
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          function test_closeFromSpread() {
@@ -1575,7 +1584,7 @@
              var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
              verify(spreadRepeater !== null);
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              appRemovedSpy.clear();
@@ -1602,7 +1611,7 @@
              tryCompare(appRemovedSpy, "count", 1)
              compare(appRemovedSpy.signalArguments[0][0], closedAppId);
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          function test_selectFromSpreadWithMouse_data() {
@@ -1622,7 +1631,7 @@
              var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
              verify(spreadRepeater !== null);
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              var focusAppId = ApplicationManager.get(2).appId;
@@ -1649,7 +1658,7 @@
              tryCompare(stage, "state", "");
              tryCompare(ApplicationManager, "focusedApplicationId", focusAppId);
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          function test_progressiveAutoScrolling() {
@@ -1658,7 +1667,7 @@
              var appRepeater = findInvisibleChild(shell, "appRepeater");
              verify(appRepeater !== null);
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              var spreadFlickable = findChild(shell, "spreadFlickable")
@@ -1684,7 +1693,7 @@
+             }
              tryCompare(spreadFlickable, "contentX", 0);
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          // This makes sure the hoverMouseArea is set to invisible AND disabled
@@ -1696,13 +1705,13 @@
              tryCompare(hoverMouseArea, "enabled", false)
              tryCompare(hoverMouseArea, "visible", false)
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              tryCompare(hoverMouseArea, "enabled", true)
              tryCompare(hoverMouseArea, "visible", true)
--            keyRelease(Qt.Key_Control)
++            keyRelease(Qt.Key_Alt)
              tryCompare(hoverMouseArea, "enabled", false)
              tryCompare(hoverMouseArea, "visible", false)
@@ -1719,7 +1728,7 @@
              var appRepeater = findInvisibleChild(shell, "appRepeater");
              verify(appRepeater !== null);
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1740,7 +1749,7 @@
              verify(y < 4000);
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          function test_focusAppFromLauncherExitsSpread() {
@@ -1750,7 +1759,7 @@
              var launcher = findChild(shell, "launcher");
              var bfb = findChild(launcher, "buttonShowDashHome");
--            keyPress(Qt.Key_Control)
++            keyPress(Qt.Key_Alt)
              keyClick(Qt.Key_Tab);
              tryCompare(desktopSpread, "state", "altTab")
@@ -1766,7 +1775,7 @@
              tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
--            keyRelease(Qt.Key_Control);
++            keyRelease(Qt.Key_Alt);
+         }
          // regression test for http://pad.lv/1443319
@@ -1989,6 +1998,86 @@
+             }
+         }
++        function test_superTabToCycleLauncher() {
++            loadShell("desktop");
++            shell.usageScenario = "desktop";
++            waitForRendering(shell);
++
++            var launcher = findChild(shell, "launcher");
++            var launcherPanel = findChild(launcher, "launcherPanel");
++            var firstAppInLauncher = LauncherModel.get(0).appId;
++
++            compare(launcher.state, "");
++            compare(launcherPanel.highlightIndex, -2);
++            compare(ApplicationManager.focusedApplicationId, "unity8-dash");
++
++            // Use Super + Tab Tab to cycle to the first entry in the launcher
++            keyPress(Qt.Key_Super_L, Qt.MetaModifier);
++            keyClick(Qt.Key_Tab);
++            tryCompare(launcher, "state", "visible");
++            tryCompare(launcherPanel, "highlightIndex", -1);
++            keyClick(Qt.Key_Tab);
++            tryCompare(launcherPanel, "highlightIndex", 0);
++            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
++            tryCompare(launcher, "state", "");
++            tryCompare(launcherPanel, "highlightIndex", -2);
++            tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
++
++            // Now go back to the dash
++            keyPress(Qt.Key_Super_L, Qt.MetaModifier);
++            keyClick(Qt.Key_Tab);
++            tryCompare(launcher, "state", "visible");
++            tryCompare(launcherPanel, "highlightIndex", -1);
++            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
++            tryCompare(launcher, "state", "");
++            tryCompare(launcherPanel, "highlightIndex", -2);
++            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
++        }
++
++        function test_longpressSuperOpensLauncher() {
++            loadShell("desktop");
++            var launcher = findChild(shell, "launcher");
++            var shortcutHint = findChild(findChild(launcher, "launcherDelegate0"), "shortcutHint")
++
++            compare(launcher.state, "");
++            keyPress(Qt.Key_Super_L, Qt.MetaModifier);
++            tryCompare(launcher, "state", "visible");
++            tryCompare(shortcutHint, "visible", true);
++
++            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
++            tryCompare(launcher, "state", "");
++            tryCompare(shortcutHint, "visible", false);
++        }
++
++        function test_metaNumberLaunchesFromLauncher_data() {
++            return [
++                {tag: "Meta+1", key: Qt.Key_1, index: 0},
++                {tag: "Meta+2", key: Qt.Key_2, index: 1},
++                {tag: "Meta+4", key: Qt.Key_5, index: 4},
++                {tag: "Meta+0", key: Qt.Key_0, index: 9},
++            ]
++        }
++
++        function test_metaNumberLaunchesFromLauncher(data) {
++            loadShell("desktop");
++            var launcher = findChild(shell, "launcher");
++            var appId = LauncherModel.get(data.index).appId;
++            waitForRendering(shell);
++
++            keyClick(data.key, Qt.MetaModifier);
++            tryCompare(ApplicationManager, "focusedApplicationId", appId);
++        }
++
++        function test_altF1OpensLauncherForKeyboardNavigation() {
++            loadShell("desktop");
++            waitForRendering(shell);
++            var launcher = findChild(shell, "launcher");
++
++            keyClick(Qt.Key_F1, Qt.AltModifier);
++            tryCompare(launcher, "state", "visible");
++            tryCompare(launcher, "focus", true)
++        }
++
          function test_inputEventsOnEdgesEndUpInAppSurface_data() {
              return [
                  { tag: "phone", repeaterName: "spreadRepeater" },