Unity 8

Merge lp:~lukas-kde/unity8/keyboardIndicator into lp:unity8

keyboardIndicator
Merge into trunk

Proposed by Lukáš Tinkl on 2016-06-20

Status:	Merged
Approved by:	Michał Sawicz on 2016-08-01
Approved revision:	2477
Merged at revision:	2553
Proposed branch:	lp:~lukas-kde/unity8/keyboardIndicator
Merge into:	lp:unity8
Diff against target:	430 lines (+185/-17) 10 files modified debian/control (+2/-1) plugins/Unity/Indicators/indicatorsmanager.cpp (+3/-5) qml/Components/KeymapSwitcher.qml (+27/-1) qml/Panel/IndicatorItemRow.qml (+13/-2) qml/Panel/Indicators/MenuItemFactory.qml (+65/-0) tests/mocks/Unity/Indicators/IndicatorsModel.qml (+41/-1) tests/qmltests/Panel/tst_IndicatorItemRow.qml (+26/-1) tests/qmltests/Panel/tst_IndicatorsBar.qml (+3/-3) tests/qmltests/Panel/tst_IndicatorsMenu.qml (+4/-3) tests/qmltests/tst_OrientedShell.qml (+1/-0)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/keyboardIndicator
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-07-31
Michael Terry		2016-06-20	Approve on 2016-07-11
Daniel d'Andrada (community)		2016-07-07	Abstain on 2016-07-11
Review via email: mp+297920@code.launchpad.net

Commit Message

Implement frontend support for running keyboard indicator

Description of the Change

Implement necessary support for the keyboard indicator

- add the keymapMenu to the menu item factory
- signal the current and active keymap
- hide/show the indicator appropriately (based on whether the system has a keyboard attached and there are keymaps configured)

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

In silo 77, https://requests.ci-train.ubuntu.com/#/ticket/1575):
- https://code.launchpad.net/~lukas-kde/ubuntu-system-settings/keyboardIndicator/+merge/297919
- https://code.launchpad.net/~tiheum/ubuntu-themes/keyboard-indicators/+merge/286671
- https://code.launchpad.net/~lukas-kde/indicator-keyboard/launch-uss-under-u8/+merge/298023

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

Yes

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

N/A

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

N/A

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

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

review: Approve (continuous-integration)

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-07

2460. By Lukáš Tinkl on 2016-07-07: merge trunk

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

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-07-07:

session-migration and dh-migrations might be a nicer way to do such one time migrations. Not necessarily necessary to switch this MP, but just saying.

Michael Terry (mterry) wrote on 2016-07-07:

Wait, also.. Why are we migrating TO gsettings? What about the unity8-greeter case?

And "org.gnome.desktop.input-sources" seems like a less "standard" place than AccountsService.InputSources.

review: Needs Information

Lukáš Tinkl (lukas-kde) wrote on 2016-07-08:

> Wait, also.. Why are we migrating TO gsettings? What about the
> unity8-greeter case?
>
> And "org.gnome.desktop.input-sources" seems like a less "standard" place than
> AccountsService.InputSources.

This is orthogonal to https://code.launchpad.net/~lukas-kde/ubuntu-system-settings/keyboardIndicator/+merge/297919, the reason being that indicator-keyboard reads the config from gsettings, not AS (altho it writes it there too, presumably for the greeter profile)

Michael Terry (mterry) wrote on 2016-07-08:

So we could also change indicator-keyboard to read from AS instead of everyone else writing to gsettings.

But changing indicator-keyboard would involve updating unity-control-center too. And losing compatibility with gnome-control-center (though I doubt we need that anymore).

So fine. We can write to gsettings and sync to AS. But I don't see where AS syncing is done in indicator-keyboard? It does some reading from AS, but I'm not sure I see it copying from gsettings to AS.

I just want to make sure we don't lose support for the greeter here.

Lukáš Tinkl (lukas-kde) wrote on 2016-07-08:

> So we could also change indicator-keyboard to read from AS instead of everyone
> else writing to gsettings.
>
> But changing indicator-keyboard would involve updating unity-control-center
> too. And losing compatibility with gnome-control-center (though I doubt we
> need that anymore).

Yeah, it's in fact another app, unity-settings-daemon that writes and keeps the config from unity-control-center...

> So fine. We can write to gsettings and sync to AS. But I don't see where AS
> syncing is done in indicator-keyboard? It does some reading from AS, but I'm
> not sure I see it copying from gsettings to AS.

We don't write any settings, we just read it; it's u-s-s that writes it (see here https://code.launchpad.net/~lukas-kde/ubuntu-system-settings/keyboardIndicator/+merge/297919)

> I just want to make sure we don't lose support for the greeter here.

We don't, it's fine since u-s-s writes to AS and that's where the greeter will pick it up.

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-08

2461. By Lukáš Tinkl on 2016-07-08: merge trunk

Michael Terry (mterry) wrote on 2016-07-08:

19 +void AccountsService::migrateKeymapSettings()

I would like to (A) see a larger comment about why this function exists, just for future coders.

Specifically, why it exists in unity8 at all. A naive watcher would suspect indicator-keyboard could do it's own homework.

OR (B) move this code to ubuntu-system-settings and only actually do migration if we're in a ubuntu-touch XDG session (while doing that move, we can switch it to a proper dh-migrations script). Because outside of this method, unity8 does not care about the input-sources gsettings key at all. That's all internal to how ubuntu-system-settings records this data for consumption by other parts of the system. I feel like you put it here just because you knew it would be run early. But that's what dh-migrations is for.

21 + QSettings settings;
22 + if (!settings.value(QStringLiteral("KeymapsMigrated")).toBool()) {

Why use QSettings like this? This might be the first time we're using unity8's default QSettings location. Can we not use GSettings like we do elsewhere in unity8? Or just use dh-migrations.

(I can try to whip up such a script... Give me a bit.)

Still haven't actually tested this. :) Getting to that.

review: Needs Fixing

Michael Terry (mterry) wrote on 2016-07-08:

OK, I filed https://code.launchpad.net/~mterry/ubuntu-system-settings/keyboardIndicator-migration/+merge/299593 against the USS branch. With that, we should be able to remove migrateKeymapSettings from this MP.

Also... I notice that this MP's use of com.canonical.indicator.keyboard.visible is not great. That's a user setting, to hide/show the indicator as the user wants (see unity-control-center's "Text Entry" panel and its "Show current input source in the menu bar" setting). We may not use that key in ubuntu-system-settings, but my point is that the key is a user setting, not a communication channel from shell to indicator.

Instead, we should hide/show it in our unity8 indicator menu bar as we wish.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-08:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-07-08:

I've just tested this on my phone (I tested the versions with my migration changes). Looks great! Good work.

So I'm +1 on this MP if:
- You merge in my migration add-on MPs.
- You switch from using com.canonical.indicator.keyboard.visible to a unity8-internal means of hiding the indicator.
- And add a test for that new hiding/showing method of the indicator, testing different number of layouts and whether nor not we have a keyboard.

review: Needs Fixing

Michael Terry (mterry) wrote on 2016-07-08:

(You can reset migration state by clearing your gsettings like "gsettings set org.gnome.desktop.input-sources sources '[]'" and editing .local/share/session_migration-ubuntu-touch to not list the new keyboard script and then rebooting.)

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-11

2462. By Lukáš Tinkl on 2016-07-11: use client-side hiding of the indicator
2463. By Lukáš Tinkl on 2016-07-11: merge lp:~mterry/unity8/keyboardIndicator-migration
2464. By Lukáš Tinkl on 2016-07-11: add a test to check hiding of the keyboard indicator
2465. By Lukáš Tinkl on 2016-07-11: remove unused var

Lukáš Tinkl (lukas-kde) wrote on 2016-07-11:

> I've just tested this on my phone (I tested the versions with my migration
> changes). Looks great! Good work.
>
> So I'm +1 on this MP if:
> - You merge in my migration add-on MPs.
> - You switch from using com.canonical.indicator.keyboard.visible to a
> unity8-internal means of hiding the indicator.
> - And add a test for that new hiding/showing method of the indicator, testing
> different number of layouts and whether nor not we have a keyboard.

I believe I addressed all your comments, let's give it another spin :)

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-11

2466. By Lukáš Tinkl on 2016-07-11: add a cleanup() function
2467. By Lukáš Tinkl on 2016-07-11: less fragile panel item finding
2468. By Lukáš Tinkl on 2016-07-11: s/tryCompare/compare
2469. By Lukáš Tinkl on 2016-07-11: also cleanup the keymaps

Daniel d'Andrada (dandrader) wrote on 2016-07-11:

Please confirm that QDBusActionGroup does indeed only work when put inside an Item instead of a QtObject. QDBusActionGroup itself is a plain QObject. So this requirement looks very odd. If it does, there's a bug somewhere that needs reporting.

review: Needs Information

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-11

2470. By Lukáš Tinkl on 2016-07-11: Recommend indicator-keyboard
2471. By Lukáš Tinkl on 2016-07-11: turn KeymapSwitcher back into a QtObject

Lukáš Tinkl (lukas-kde) wrote on 2016-07-11:

> Please confirm that QDBusActionGroup does indeed only work when put inside an
> Item instead of a QtObject. QDBusActionGroup itself is a plain QObject. So
> this requirement looks very odd. If it does, there's a bug somewhere that
> needs reporting.

Good point, restored it as a QtObject - works fine, dunno why it hadn't worked for me initially. Thanks for pointing out

Daniel d'Andrada (dandrader) wrote on 2016-07-11:

Glad to hear it works inside a QtObject.

review: Abstain

Michael Terry (mterry) wrote on 2016-07-11:

Just tested this and it still works. Thanks for integrating the session-migration stuff and making the other changes. This looks good to me!

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-13:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-13

2472. By Lukáš Tinkl on 2016-07-13: fixup failing tests

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-13:

FAILED: Continuous integration, rev:2472
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1720/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2270/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2298
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2204
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2204
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2204

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

review: Needs Fixing (continuous-integration)

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

Text conflict in plugins/Unity/Indicators/indicatorsmanager.cpp
1 conflicts encountered.

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-14

2473. By Lukáš Tinkl on 2016-07-14: merge trunk

Lukáš Tinkl (lukas-kde) wrote on 2016-07-14:

Merged trunk, resolved conflict and fixed up failing tests

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

FAILED: Continuous integration, rev:2473
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1721/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2271/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2299
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2205
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2205
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2205

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2473
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1729/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2279/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2307
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2211
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2211
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2211

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-29:

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

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-29

2474. By Lukáš Tinkl on 2016-07-29: stabilize tests
2475. By Lukáš Tinkl on 2016-07-29: stabilize++

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-29:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-30:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-07-30:

Tests likely failing in CI because of missing icons:

QWARN : qmltestrunner::IndicatorItemRow::test_validCurrentItem(row 1) file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/1.3/Icon.qml:115:5: QML Image: Failed to get image from provider: image://theme/indicator-keyboard-Cs-1

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-30

2476. By Lukáš Tinkl on 2016-07-30: try with a generic icon

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-30:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-07-30:

All tests passing again, with the (known) exceptions in yakkety

lp:~lukas-kde/unity8/keyboardIndicator updated on 2016-07-31

2477. By Lukáš Tinkl on 2016-07-31: merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-31:

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

review: Needs Fixing (continuous-integration)

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:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/control'
 --- debian/control	2016-07-22 07:42:41 +0000
 +++ debian/control	2016-07-31 17:02:58 +0000
@@ -130,7 +130,8 @@
           unity8-private | unity-launcher-impl,
           ${misc:Depends},
           ${shlibs:Depends},
--Recommends: indicator-session,
++Recommends: indicator-keyboard,
++            indicator-session,
              unity-scope-click,
              unity-scope-mediascanner2,
  Breaks: indicator-network (<< 0.5.1+14.10.20141014),
 === modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
 --- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-06-08 21:52:16 +0000
 +++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-07-31 17:02:58 +0000
@@ -114,10 +114,6 @@
      QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
      const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
--    if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
--        return; // convergence: skip this indicator until it works in Mir
--    }
--
      auto iter = m_indicatorsData.constFind(name);
      if (iter != m_indicatorsData.constEnd())
+     {
@@ -285,11 +281,13 @@
      // convergence:
      // 1) enable session indicator
--    // 2) on a PC, switch the battery/power indicator to desktop mode,
++    // 2) enable keyboard indicator
++    // 3) on a PC, switch the battery/power indicator to desktop mode,
      //    can't control brightness for now and phone-on-desktop broken (FIXME)
      //
      // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
      if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
++            || new_indicator->identifier() == QStringLiteral("indicator-keyboard")
              || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
          new_indicator->setProfile(m_profile.replace(QStringLiteral("phone"), QStringLiteral("desktop")));
      } else {
 === modified file 'qml/Components/KeymapSwitcher.qml'
 --- qml/Components/KeymapSwitcher.qml	2016-04-04 13:38:56 +0000
 +++ qml/Components/KeymapSwitcher.qml	2016-07-31 17:02:58 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.4
  import AccountsService 0.1
  import GlobalShortcut 1.0
++import QMenuModel 0.1
  import Unity.Application 0.1
  QtObject {
@@ -36,7 +37,8 @@
      readonly property var keymaps: AccountsService.keymaps
      readonly property int keymapCount: keymaps.length
--    property int currentKeymapIndex: 0
++    // default keymap, either the one remembered by the indicator, or the 1st one selected by user
++    property int currentKeymapIndex: actionGroup.currentAction.valid ? actionGroup.currentAction.state : 0
      readonly property string currentKeymap: keymaps[currentKeymapIndex]
      function nextKeymap() {
@@ -62,4 +64,28 @@
          property: "keymap"
          value: root.currentKeymap
+     }
++
++    // indicator
++    property QDBusActionGroup actionGroup: QDBusActionGroup {
++        busType: DBus.SessionBus
++        busName: "com.canonical.indicator.keyboard"
++        objectPath: "/com/canonical/indicator/keyboard"
++
++        property variant currentAction: action("current")
++        property variant activeAction: action("active")
++
++        Component.onCompleted: actionGroup.start();
++    }
++
++    onCurrentKeymapIndexChanged: {
++        actionGroup.currentAction.updateState(currentKeymapIndex);
++    }
++
++    readonly property int activeActionState: actionGroup.activeAction.valid ? actionGroup.activeAction.state : -1
++
++    onActiveActionStateChanged: {
++        if (activeActionState != -1) {
++            currentKeymapIndex = activeActionState;
++        }
++    }
+ }
 === modified file 'qml/Panel/IndicatorItemRow.qml'
 --- qml/Panel/IndicatorItemRow.qml	2016-03-29 03:47:39 +0000
 +++ qml/Panel/IndicatorItemRow.qml	2016-07-31 17:02:58 +0000
@@ -18,6 +18,10 @@
  import QtQuick.Window 2.2
  import Ubuntu.Components 1.3
++// for indicator-keyboard
++import AccountsService 0.1
++import Unity.InputInfo 0.1
++
  Item {
      id: root
      width: row.width
@@ -127,6 +131,11 @@
          property bool forceAlignmentAnimationDisabled: false
+     }
++    InputDeviceModel {
++        id: keyboardsModel
++        deviceFilter: InputInfo.Keyboard
++    }
++
      onCurrentItemChanged: {
          if (d.previousItem) {
              d.firstItemSwitch = false;
@@ -184,9 +193,11 @@
                  property int ownIndex: index
                  property bool overflow: row.width - x > overFlowWidth
--                property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator)
++                property bool hidden: !expanded && (overflow || !indicatorVisible || hideSessionIndicator || hideKeyboardIndicator)
                  // HACK for indicator-session
                  readonly property bool hideSessionIndicator: identifier == "indicator-session" && Math.min(Screen.width, Screen.height) <= units.gu(60)
++                // HACK for indicator-keyboard
++                readonly property bool hideKeyboardIndicator: identifier == "indicator-keyboard" && (AccountsService.keymaps.length < 2 || keyboardsModel.count == 0)
                  height: row.height
                  expanded: root.expanded
@@ -202,7 +213,7 @@
                      NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing }
+                 }
--                width: ((expanded || indicatorVisible) && !hideSessionIndicator) ? implicitWidth : 0
++                width: ((expanded || indicatorVisible) && !hideSessionIndicator && !hideKeyboardIndicator) ? implicitWidth : 0
                  Behavior on width {
                      NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing }
 === modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
 --- qml/Panel/Indicators/MenuItemFactory.qml	2016-05-20 08:43:45 +0000
 +++ qml/Panel/Indicators/MenuItemFactory.qml	2016-07-31 17:02:58 +0000
@@ -985,6 +985,62 @@
+         }
+     }
++    Component {
++        id: keymapMenu;
++
++        // FIXME this should use a "radio button" menu, once we have it in the SDK
++        ListItems.Empty {
++            id: checkItem
++            objectName: "keymapMenu"
++            property QtObject menuData: null
++            property int menuIndex: -1
++            readonly property bool serverChecked: menuData && menuData.isToggled || false
++
++            enabled: menuData && menuData.sensitive || false
++            highlightWhenPressed: false
++            __acceptEvents: !serverChecked
++
++            CheckBox {
++                id: checkbox
++                __acceptEvents: !checkItem.serverChecked
++                anchors {
++                    left: parent.left
++                    leftMargin: checkItem.__contentsMargins
++                    verticalCenter: parent.verticalCenter
++                }
++            }
++
++            ServerPropertySynchroniser {
++                objectName: "sync"
++                syncTimeout: Utils.Constants.indicatorValueTimeout
++
++                serverTarget: checkItem
++                serverProperty: "serverChecked"
++                userTarget: checkbox
++                userProperty: "checked"
++
++                onSyncTriggered: {
++                    menuModel.activate(checkItem.menuIndex);
++                }
++            }
++
++            Label {
++                id: label
++                anchors {
++                    left: checkbox.right
++                    leftMargin: checkItem.__contentsMargins
++                    right: parent.right
++                    rightMargin: checkItem.__contentsMargins
++                    verticalCenter: parent.verticalCenter
++                }
++                elide: Text.ElideRight
++                text: checkItem.menuData && checkItem.menuData.label || ""
++            }
++
++            onClicked: menuModel.activate(menuIndex);
++        }
++    }
++
      function load(modelData, context) {
          // tweak indicator-session items
          if (context === "indicator-session") {
@@ -995,6 +1051,15 @@
+             }
+         }
++        // specialize for indicator-keyboard
++        if (context === "indicator-keyboard") {
++            if (modelData.isRadio) {
++                return keymapMenu;
++            } else if (modelData.action === "indicator.map" || modelData.action === "indicator.chart") {
++                return null; // map and chart not available
++            }
++        }
++
          if (modelData.type !== undefined && modelData.type !== "") {
              var component = undefined;
 === modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
 --- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2015-07-15 15:07:19 +0000
 +++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2016-07-31 17:02:58 +0000
@@ -16,12 +16,23 @@
  import QtQuick 2.4
  import Unity.Indicators 0.1 as Indicators
++import Unity.InputInfo 0.1
++import AccountsService 0.1
  Indicators.FakeIndicatorsModel {
      id: root
      property var originalModelData: [
+         {
++            "identifier": "indicator-keyboard",
++            "indicatorProperties": {
++                "enabled": true,
++                "busName": "com.canonical.indicators.fake0",
++                "menuObjectPath": "/com/canonical/indicators/fake0",
++                "actionsObjectPath": "/com/canonical/indicators/fake0"
++            }
++        },
++        {
              "identifier": "fake-indicator-bluetooth",
              "indicatorProperties": {
                  "enabled": true,
@@ -74,13 +85,38 @@
                  "menuObjectPath": "/com/canonical/indicators/fake6",
                  "actionsObjectPath": "/com/canonical/indicators/fake6"
+             }
++        },
++        {
++            "identifier": "fake-indicator-session",
++            "indicatorProperties": {
++                "enabled": true,
++                "busName": "com.canonical.indicators.fake7",
++                "menuObjectPath": "/com/canonical/indicators/fake7",
++                "actionsObjectPath": "/com/canonical/indicators/fake7"
++            }
+         }
+     ]
++    Component.onCompleted: {
++        // init data for the fake indicator-keyboard
++        MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
++        AccountsService.keymaps = ["us", "cs"];
++    }
++
++    Component.onDestruction: {
++        MockInputDeviceBackend.removeDevice("/indicator_kbd0");
++        AccountsService.keymaps = ["us"];
++    }
++
      function load(profile) {
          unload();
          root.modelData = originalModelData;
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake0",
++                                           getUnityMenuModelData("indicator-keyboard",
++                                                                 "Czech (F)",
++                                                                 "",
++                                                                 [ "image://theme/input-keyboard-symbolic" ]));
          Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake1",
                                             getUnityMenuModelData("fake-indicator-bluetooth",
                                                                   "Bluetooth (F)",
@@ -111,6 +147,11 @@
                                                                   "Upcoming Events (F)",
                                                                   "12:04",
                                                                   []));
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake7",
++                                           getUnityMenuModelData("fake-indicator-session",
++                                                                 "System (F)",
++                                                                 "",
++                                                                 ["image://theme/system-devices-panel"]));
+     }
      function getUnityMenuModelData(identifier, title, label, icons) {
@@ -173,6 +214,5 @@
                  break;
+             }
+         }
--
+     }
+ }
 === modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
 --- tests/qmltests/Panel/tst_IndicatorItemRow.qml	2016-03-29 03:47:39 +0000
 +++ tests/qmltests/Panel/tst_IndicatorItemRow.qml	2016-07-31 17:02:58 +0000
@@ -21,6 +21,8 @@
  import Ubuntu.Components 1.3
  import Unity.Test 0.1 as UT
  import Unity.Indicators 0.1 as Indicators
++import AccountsService 0.1
++import Unity.InputInfo 0.1
  IndicatorTest {
      id: root
@@ -194,7 +196,7 @@
              verify(dataItem !== null);
              indicatorsRow.selectItemAt(dataItem.x + dataItem.width/2);
--            compare(indicatorsRow.currentItem, dataItem);
++            tryCompare(indicatorsRow, "currentItem", dataItem);
+         }
          // tests item default selection (no item at position X)
@@ -285,5 +287,28 @@
              // should go back to 0
              tryCompare(findChild(indicatorsRow, "highlight"), "highlightCenterOffset", 0);
+         }
++
++        function test_hidingKeyboardIndicator_data() {
++            return [
++                { tag: "No keyboard, no keymap", keyboard: false, keymaps: [], hidden: true },
++                { tag: "No keyboard, one keymap", keyboard: false, keymaps: ["us"], hidden: true },
++                { tag: "No keyboard, 2 keymaps", keyboard: false, keymaps: ["us", "cs"], hidden: true },
++                { tag: "Keyboard, no keymap", keyboard: true, keymaps: [], hidden: true },
++                { tag: "Keyboard, one keymap", keyboard: true, keymaps: ["us"], hidden: true },
++                { tag: "Keyboard, 2 keymaps", keyboard: true, keymaps: ["us", "cs"], hidden: false }
++            ];
++        }
++
++        function test_hidingKeyboardIndicator(data) {
++            var item = findChild(indicatorsRow, "indicator-keyboard-panelItem");
++            AccountsService.keymaps = data.keymaps;
++            if (data.keyboard) {
++                MockInputDeviceBackend.addMockDevice("/indicator_kbd0", InputInfo.Keyboard);
++            } else {
++                MockInputDeviceBackend.removeDevice("/indicator_kbd0");
++            }
++
++            compare(item.hidden, data.hidden);
++        }
+     }
+ }
 === modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
 --- tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-07-15 15:13:18 +0000
 +++ tests/qmltests/Panel/tst_IndicatorsBar.qml	2016-07-31 17:02:58 +0000
@@ -136,6 +136,7 @@
+         }
          function wait_for_expansion_to_settle() {
++            waitUntilTransitionsEnd(indicatorsBar);
              tryCompare(heightAnimation, "running", false);
              wait(UbuntuAnimation.SnapDuration); // put a little extra wait in for things to settle
+         }
@@ -151,7 +152,6 @@
              indicatorsBar.expanded = true;
              wait_for_expansion_to_settle();
--
              // mappedPosition contained within mappedRect
              tryCompareFunction(function() {
                  var mappedRect = indicatorsBar.mapFromItem(dataItem, 0, 0, dataItem.width, dataItem.height);
@@ -203,8 +203,8 @@
          function test_visibleIndicators_data() {
              return [
--                { visible: [true, false, true, false, true, true] },
--                { visible: [false, false, false, false, false, false] }
++                { visible: [true, false, true, false, true, true, false, true] },
++                { visible: [false, false, false, false, false, false, true, false] }
              ];
+         }
 === modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
 --- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2016-06-15 14:36:15 +0000
 +++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2016-07-31 17:02:58 +0000
@@ -219,8 +219,8 @@
                             mappedPosition.x, indicatorsMenu.openedHeight / 2,
                             true /* beginTouch */, false /* endTouch */);
--                compare(indicatorItemRow.currentItem, indicatorItem,
--                        "Incorrect item activated at position " + i);
++                tryCompare(indicatorItemRow, "currentItem", indicatorItem, undefined /*timeout, default */,
++                           "Incorrect item activated at position " + i);
                  touchFlick(indicatorItemRow,
                             mappedPosition.x, indicatorsMenu.openedHeight / 2,
@@ -265,7 +265,8 @@
                         false /* beginTouch */, false /* endTouch */,
                         units.gu(50) /* speed */, 5 /* iterations */); // more samples needed for accurate velocity
--            compare(indicatorItemRow.currentItem, firstItem, "First indicator should still be the current item");
++            tryCompare(indicatorItemRow, "currentItem", firstItem, undefined /* timeout, default */,
++                       "First indicator should still be the current item");
              // after waiting in the same spot with touch down, it should update to the next item.
              tryCompare(indicatorItemRow, "currentItem", nextItem);
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2016-06-30 19:04:19 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2016-07-31 17:02:58 +0000
@@ -1117,6 +1117,7 @@
          function test_attachRemoveInputDevices(data) {
              loadShell("mako")
++            MockInputDeviceBackend.removeDevice("/indicator_kbd0");
              var shell = findChild(orientedShell, "shell");
              var inputMethod = findChild(shell, "inputMethod");