Merge lp:~unity-team/unity8/keymapSwitching into lp:unity8

[Michał Sawicz]

Keymap switching support

 * Are there any related MPs required for this MP to build/function as expected? Please list.
    lp:~unity-team/unity-api/kbdLayout
    lp:~unity-team/qtmir/kbdLayout
    lp:~lukas-kde/qtubuntu/kbdLayout

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Will in silo
 * 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?
Y
 * If you changed the UI, has there been a design review?
N/A

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2275
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/674/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/887
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/903
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/903
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/901/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/901/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/901/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/901/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/901/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/901/console

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Some inline comments. Haven't reviewed test code yet. Am still setting up my phone to test these branches there.

review: Needs Fixing

[lp:~unity-team/unity8/keymapSwitching]

2276. By Lukáš Tinkl on 2016-03-11

drop unneeded changes

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2276
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/680/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/895
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/911
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/911
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/909/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/909/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/keymapSwitching]

2277. By Lukáš Tinkl on 2016-03-11

move the keymap switching to Shell

to survive Stage switching

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2277
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/681/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/899
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/915
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/915
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/913/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/913/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/913/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/913/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/913/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/913/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/keymapSwitching]

2278. By Michał Sawicz on 2016-03-11

Merge lp:~unity-team/unity8/shell_chrome

2279. By Lukáš Tinkl on 2016-03-12

refine test for switching keymaps, move to tst_Shell

2280. By Lukáš Tinkl on 2016-03-14

remove activeKeymapIndex, refine tests

2281. By Lukáš Tinkl on 2016-03-14

remove debug

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-11 17:34:24 +0000
+++ CMakeLists.txt	2016-03-11 17:34:24 +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-03-11 17:34:24 +0000
+++ debian/control	2016-03-11 17:34:24 +0000
@@ -29,7 +29,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.107),
+               libunity-api-dev (>= 7.108),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!armhf],
@@ -130,7 +130,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
          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-10,
@@ -176,7 +176,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-03-11 17:34:24 +0000
+++ plugins/AccountsService/AccountsService.cpp	2016-03-11 17:34:24 +0000
@@ -37,6 +37,7 @@
 #define PROP_ENABLE_INDICATORS_WHILE_LOCKED    QStringLiteral("EnableIndicatorsWhileLocked")
 #define PROP_ENABLE_LAUNCHER_WHILE_LOCKED      QStringLiteral("EnableLauncherWhileLocked")
 #define PROP_FAILED_LOGINS                     QStringLiteral("FailedLogins")
+#define PROP_INPUT_SOURCES                     QStringLiteral("InputSources")
 #define PROP_LICENSE_ACCEPTED                  QStringLiteral("LicenseAccepted")
 #define PROP_LICENSE_BASE_PATH                 QStringLiteral("LicenseBasePath")
 #define PROP_MOUSE_CURSOR_SPEED                QStringLiteral("MouseCursorSpeed")
@@ -54,6 +55,10 @@
 #define PROP_TOUCHPAD_TAP_TO_CLICK             QStringLiteral("TouchpadTapToClick")
 #define PROP_TOUCHPAD_TWO_FINGER_SCROLL        QStringLiteral("TouchpadTwoFingerScroll")
 
+using StringMap = QMap<QString,QString>;
+using StringMapList = QList<StringMap>;
+Q_DECLARE_METATYPE(StringMapList)
+
 
 QVariant primaryButtonConverter(const QVariant &value)
 {
@@ -80,6 +85,7 @@
     connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
 
     registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));
+    registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
     registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
     registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
     registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
@@ -206,6 +212,26 @@
     return !value.toString().isNull();
 }
 
+QStringList AccountsService::keymaps() const
+{
+    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES);
+    QDBusArgument arg = value.value<QDBusArgument>();
+    StringMapList maps = qdbus_cast<StringMapList>(arg);
+    QStringList simplifiedMaps;
+
+    Q_FOREACH(const StringMap &map, maps) {
+        Q_FOREACH(const QString &entry, map) {
+            simplifiedMaps.append(entry);
+        }
+    }
+
+    if (!simplifiedMaps.isEmpty()) {
+        return simplifiedMaps;
+    }
+
+    return {QStringLiteral("us")};
+}
+
 uint AccountsService::failedLogins() const
 {
     return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2016-03-11 17:34:24 +0000
+++ plugins/AccountsService/AccountsService.h	2016-03-11 17:34:24 +0000
@@ -22,6 +22,7 @@
 #include <QHash>
 #include <QObject>
 #include <QString>
+#include <QStringList>
 #include <QVariant>
 
 class AccountsServiceDBusAdaptor;
@@ -68,6 +69,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 {
@@ -93,6 +97,7 @@
     void setHereEnabled(bool enabled);
     QString hereLicensePath() const;
     bool hereLicensePathValid() const;
+    QStringList keymaps() const;
 
 Q_SIGNALS:
     void userChanged();
@@ -105,6 +110,7 @@
     void failedLoginsChanged();
     void hereEnabledChanged();
     void hereLicensePathChanged();
+    void keymapsChanged();
 
 private Q_SLOTS:
     void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-03-11 17:34:24 +0000
+++ qml/Shell.qml	2016-03-11 17:34:24 +0000
@@ -102,6 +102,8 @@
     // internal props from here onwards
     readonly property var mainApp:
             applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainApp : null
+    readonly property var mainAppWindow:
+            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainAppWindow : null
 
     // Disable everything while greeter is waiting, so that the user can't swipe
     // the greeter or launcher until we know whether the session is locked.
@@ -737,6 +739,57 @@
         onMouseMoved: { cursor.opacity = 1; }
     }
 
+    // keymap switching
+    GlobalShortcut {
+        shortcut: Qt.MetaModifier|Qt.Key_Space
+        onTriggered: keymapPriv.nextKeymap()
+        active: keymapPriv.keymapCount > 1
+    }
+
+    GlobalShortcut {
+        shortcut: Qt.MetaModifier|Qt.ShiftModifier|Qt.Key_Space
+        onTriggered: keymapPriv.previousKeymap()
+        active: keymapPriv.keymapCount > 1
+    }
+
+    QtObject {
+        id: keymapPriv
+
+        readonly property var keymaps: AccountsService.keymaps
+        readonly property int keymapCount: keymaps.length
+        readonly property int activeKeymapIndex: mainAppWindow ? keymaps.indexOf(mainAppWindow.activeKeymap) : 0 // the one that the window currently has
+        property int currentKeymapIndex: 0  // the new one that we're setting
+        onCurrentKeymapIndexChanged: switchToKeymap();
+
+        function nextKeymap() {
+            var nextIndex = 0;
+
+            if (activeKeymapIndex !== -1 && activeKeymapIndex < keymapCount - 1) {
+                nextIndex = activeKeymapIndex + 1;
+            }
+            print("!!! next keymap:", currentKeymapIndex, "->", nextIndex);
+            currentKeymapIndex = nextIndex;
+        }
+
+        function previousKeymap() {
+            var prevIndex = keymapCount - 1;
+
+            if (activeKeymapIndex > 0) {
+                prevIndex = activeKeymapIndex - 1;
+            }
+            print("!!! prev keymap:", currentKeymapIndex, "->", prevIndex);
+            currentKeymapIndex = prevIndex;
+        }
+
+        function switchToKeymap() {
+            if (mainAppWindow) {
+                mainAppWindow.switchToKeymap(keymaps[currentKeymapIndex]);
+            }
+        }
+    }
+
+    onMainAppWindowChanged: keymapPriv.switchToKeymap()
+
     Rectangle {
         id: shutdownFadeOutRectangle
         z: cursor.z + 1

=== modified file 'qml/Stages/AbstractStage.qml'
--- qml/Stages/AbstractStage.qml	2016-03-11 17:34:24 +0000
+++ qml/Stages/AbstractStage.qml	2016-03-11 17:34:24 +0000
@@ -44,6 +44,7 @@
 
     // To be read from outside
     property var mainApp: null
+    property var mainAppWindow: null
     property int mainAppWindowOrientationAngle
     property bool orientationChangesEnabled
     property int supportedOrientations: Qt.PortraitOrientation

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2016-02-12 00:10:54 +0000
+++ qml/Stages/ApplicationWindow.qml	2016-03-11 17:34:24 +0000
@@ -29,6 +29,7 @@
     property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
     readonly property string title: sessionContainer.surface && sessionContainer.surface.name !== "" ?
                                         sessionContainer.surface.name : d.name
+    readonly property string activeKeymap: sessionContainer.surfaceContainer ? sessionContainer.surfaceContainer.activeKeymap : "us"
 
     // to be set from outside
     property QtObject application
@@ -37,6 +38,10 @@
     property int requestedWidth: -1
     property int requestedHeight: -1
 
+    function switchToKeymap(keymap) {
+        sessionContainer.surfaceContainer.switchToKeymap(keymap);
+    }
+
     readonly property int minimumWidth: sessionContainer.surface ? sessionContainer.surface.minimumWidth : 0
     readonly property int minimumHeight: sessionContainer.surface ? sessionContainer.surface.minimumHeight : 0
     readonly property int maximumWidth: sessionContainer.surface ? sessionContainer.surface.maximumWidth : 0

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2016-03-11 17:34:24 +0000
+++ qml/Stages/DesktopStage.qml	2016-03-11 17:34:24 +0000
@@ -40,6 +40,8 @@
             ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
             : null
 
+    mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null
+
     // application windows never rotate independently
     mainAppWindowOrientationAngle: shellOrientationAngle
 
@@ -284,6 +286,8 @@
                 property bool visuallyMaximized: false
                 property bool visuallyMinimized: false
 
+                readonly property alias appWindow: decoratedWindow.window
+
                 onFocusChanged: {
                     if (focus && ApplicationManager.focusedApplicationId !== appId) {
                         ApplicationManager.focusApplication(appId);

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2016-03-11 17:34:24 +0000
+++ qml/Stages/PhoneStage.qml	2016-03-11 17:34:24 +0000
@@ -111,6 +111,8 @@
             ? applicationManager.findApplication(applicationManager.focusedApplicationId)
             : null
 
+    mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null
+
     orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
                                && !priv.focusedAppDelegateIsDislocated
                                && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2016-03-11 17:34:24 +0000
+++ qml/Stages/SpreadDelegate.qml	2016-03-11 17:34:24 +0000
@@ -32,6 +32,7 @@
     readonly property alias appWindowOrientationAngle: appWindowWithShadow.orientationAngle
     readonly property alias appWindowRotation: appWindowWithShadow.rotation
     readonly property alias orientationChangesEnabled: appWindow.orientationChangesEnabled
+    readonly property alias appWindow: appWindow
 
     // to be set from outside
     property bool interactive: true

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-11-30 12:18:40 +0000
+++ qml/Stages/SurfaceContainer.qml	2016-03-11 17:34:24 +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,10 +35,25 @@
     property int requestedWidth: -1
     property int requestedHeight: -1
 
+    readonly property string activeKeymap: surface ? (surface.keymapVariant !== "" ? surface.keymapLayout + "+" + surface.keymapVariant : surface.keymapLayout)
+                                                   : "us"
+    property string savedKeymap: AccountsService.keymaps[0] // start with the user default
+
     onSurfaceChanged: {
         if (surface) {
             surfaceItem.surface = surface;
             root.hadSurface = false;
+            switchToKeymap(savedKeymap);
+        }
+    }
+
+    function switchToKeymap(keymap) {
+        var finalKeymap = keymap.split("+");
+        savedKeymap = keymap; // save the keymap in case the surface changes later
+
+        if (surface) {
+            print("!!! Switching to keymap", keymap);
+            surface.setKeymap(finalKeymap[0], finalKeymap[1] || "");
         }
     }
 

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2016-03-11 17:34:24 +0000
+++ qml/Stages/TabletStage.qml	2016-03-11 17:34:24 +0000
@@ -76,6 +76,8 @@
         }
     }
 
+    mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null
+
     orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
 
     supportedOrientations: mainApp ? mainApp.supportedOrientations

=== 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-03-11 17:34:24 +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-03-11 17:34:24 +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/QMenuModel/QDBusActionGroup.qml'
--- tests/mocks/QMenuModel/QDBusActionGroup.qml	2015-07-21 14:38:35 +0000
+++ tests/mocks/QMenuModel/QDBusActionGroup.qml	2016-03-11 17:34:24 +0000
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *   Daniel d'Andrada <[e-mail]>
+ * 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
@@ -18,7 +15,6 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Settings.Menus 0.1 as Menus
 import QMenuModel 0.1
 
 QtObject {
@@ -47,6 +43,10 @@
                 function activate() {
                     activated();
                 }
+
+                function updateState(newState) {
+                    state = newState;
+                }
             }", actionGroup);
     }
 }

=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
--- tests/mocks/Unity/Application/MirSurface.cpp	2016-03-11 17:34:24 +0000
+++ tests/mocks/Unity/Application/MirSurface.cpp	2016-03-11 17:34:24 +0000
@@ -133,7 +133,24 @@
     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)
+{
+    if (layout.isEmpty()) {
+        return;
+    }
+    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	2016-03-11 17:34:24 +0000
+++ tests/mocks/Unity/Application/MirSurface.h	2016-03-11 17:34:24 +0000
@@ -74,6 +74,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
 
@@ -156,6 +160,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/plugins/AccountsService/PropertiesServer.cpp'
--- tests/plugins/AccountsService/PropertiesServer.cpp	2016-03-11 17:34:24 +0000
+++ tests/plugins/AccountsService/PropertiesServer.cpp	2016-03-11 17:34:24 +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();
 }
 
@@ -63,6 +69,8 @@
             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;
@@ -100,4 +108,5 @@
     m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";
     m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";
     m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";
+    m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());
 }

=== modified file 'tests/plugins/AccountsService/PropertiesServer.h'
--- tests/plugins/AccountsService/PropertiesServer.h	2016-03-11 17:34:24 +0000
+++ tests/plugins/AccountsService/PropertiesServer.h	2016-03-11 17:34:24 +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	2016-03-11 17:34:24 +0000
+++ tests/plugins/AccountsService/client.cpp	2016-03-11 17:34:24 +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)); }
@@ -52,6 +57,9 @@
 
         QObject::connect(m_uscInputInterface, SIGNAL(setMousePrimaryButtonCalled(int)),
                          this, SIGNAL(setMousePrimaryButtonCalled(int)));
+
+        qDBusRegisterMetaType<StringMap>();
+        qDBusRegisterMetaType<StringMapList>();
     }
 
 private Q_SLOTS:
@@ -266,6 +274,28 @@
         QCOMPARE(arguments.at(0).toInt(), 0);
     }
 
+    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);
     void setMousePrimaryButtonCalled(int button);

=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
--- tests/qmltests/Stages/tst_DesktopStage.qml	2016-03-11 17:34:24 +0000
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-03-11 17:34:24 +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"
@@ -130,6 +131,11 @@
         }
     }
 
+    SignalSpy {
+        id: keymapSpy
+        signalName: "activated"
+    }
+
     UnityTestCase {
         id: testCase
         name: "DesktopStage"
@@ -510,8 +516,6 @@
         }
 
         function test_dropShadow() {
-            killAllRunningApps();
-
             // verify the drop shadow is not visible initially
             verify(PanelState.dropShadow == false);
 
@@ -536,5 +540,50 @@
             // 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
+
+            var facebookWindow = desktopStage.mainAppWindow;
+            verify(facebookWindow);
+
+            // switch to next keymap (should be "fr")
+            facebookWindow.switchToKeymap(1);
+            var frKeymap = AccountsService.keymaps[1].split("+");
+            tryCompare(appSurface, "keymapLayout", frKeymap[0]);
+            tryCompare(appSurface, "keymapVariant", "");
+
+            // verify the surface reports the same keymap as the ApplicationWindow
+            tryCompare(appSurface, "keymapLayout", facebookWindow.activeKeymap);
+
+            // switch to next keymap again (should be "us")
+            facebookWindow.switchToKeymap(2);
+            tryCompare(facebookWindow, "activeKeymap", "us");
+        }
+
+        function test_switchKeymapShortcuts() {
+            var keymapActionGroup = findInvisibleChild(desktopStage, "keymapActionGroup");
+            verify(keymapActionGroup);
+
+            keymapSpy.target = keymapActionGroup.nextAction;
+
+            // switch to next keymap
+            keyClick(Qt.Key_Space, Qt.MetaModifier);
+            tryCompare(keymapSpy, "count", 1);
+
+            keymapSpy.clear();
+
+            // switch to previous keymap
+            keyClick(Qt.Key_Space, Qt.MetaModifier|Qt.ShiftModifier);
+            tryCompare(keymapSpy, "count", 1);
+        }
     }
 }