ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/fix-language-button into lp:ubuntu-keyboard

fix-language-button
Merge into trunk

Proposed by Michael Sheldon on 2015-02-06

Status:

Superseded

Proposed branch:

lp:~michael-sheldon/ubuntu-keyboard/fix-language-button

Merge into:

lp:ubuntu-keyboard

Diff against target:

536 lines (+215/-28)

12 files modified

data/schemas/com.canonical.keyboard.maliit.gschema.xml (+5/-0)
qml/Keyboard.qml (+6/-5)
qml/KeyboardContainer.qml (+1/-2)
qml/keys/LanguageKey.qml (+29/-8)
qml/keys/LanguageMenu.qml (+28/-7)
src/plugin/inputmethod.cpp (+30/-0)
src/plugin/inputmethod.h (+5/-0)
src/plugin/inputmethod_p.h (+11/-0)
src/plugin/keyboardsettings.cpp (+20/-0)
src/plugin/keyboardsettings.h (+3/-0)
tests/autopilot/ubuntu_keyboard/emulators/keypad.py (+1/-0)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+76/-6)

To merge this branch:

bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-language-button

Related bugs:

Bug #1416037: [osk] Language button should always be visible	High	Fix Released
Bug #1416157: [osk] emoji menu should toggle in both directions	High	Fix Released
Bug #1417048: Tapping input source button opens menu instead of cycling layouts	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-02-10
Bill Filler (community)		2015-02-06	Needs Fixing on 2015-02-07
Review via email: mp+248948@code.launchpad.net

This proposal has been superseded by a proposal from 2015-02-24.

Commit message

Always display the language button, even when only one language is enabled (so settings is easily accessible) and modify language button behaviour to toggle between most recently used layouts when tapped and to only show the menu when long pressed.

Description of the change

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2015-02-06:

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

* No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

* Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

* Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

* Yes

If you changed the UI, was the change specified/approved by design?

* Changed language button behaviour to match existing design spec

If you changed UI labels, did you update the pot file?

* No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

* No change

lp:~michael-sheldon/ubuntu-keyboard/fix-language-button updated on 2015-02-06

300. By Michael Sheldon on 2015-02-06: Maintain track of previous language when automatically switching back from Emoji layout on field change

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2015-02-07:

Couple of things
1) I think we are not clearing the previous-language setting when a keyboard layout is disabled from the system settings. For example, I had English and Spanish enabled and used the key to toggle between them. Then went to the settings and disabled Spanish. The lang key still toggled between them even though Spanish had been disabled. Probably in the case of only where there is only one language we should display the menu when pressing the key.

2) Not sure about having the ... long press hint on the globe key. Looks a bit cluttered even though we have it there for consistency. I think it might be better to remove it.

3) In the menu, could we change the text for "Settings" to "Settings..." and/or change the font style to visually differentiate Settings from the language names? Maybe a thicker separator after the last language name could help. And no separator after Settings entry.

4) If not difficult it would also help to have a check mark (or some visual indication) of the currently selected language in the menu when it is displayed.

review: Needs Fixing

lp:~michael-sheldon/ubuntu-keyboard/fix-language-button updated on 2015-02-09

301. By Michael Sheldon on 2015-02-09: Remove annotation on language key
302. By Michael Sheldon on 2015-02-09: Clear previous language if it's been removed from enabled languages
303. By Michael Sheldon on 2015-02-09: Show currently active language in menu and fix menu width
304. By Michael Sheldon on 2015-02-09: Adjust settings menu height dynamically
305. By Michael Sheldon on 2015-02-09: Clean up settings menu item and separate it slightly from other items
306. By Michael Sheldon on 2015-02-09: Set previous language when active language updated

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~michael-sheldon/ubuntu-keyboard/fix-language-button updated on 2015-02-09

307. By Michael Sheldon on 2015-02-09: Fix autopilot tests
308. By Michael Sheldon on 2015-02-09: Fix flaky autopilot test

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2015-02-10:

Code looks good and all working well. But seems autopilot test is failing still in CI (see previous run http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1109).

Please take a look, could be a flaky test or timing related, or perhaps it's a problem with CI.

lp:~michael-sheldon/ubuntu-keyboard/fix-language-button updated on 2015-02-10

309. By Michael Sheldon on 2015-02-10: Move input area out of the way of notifications in autopilot tests

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2015-02-19:

Looks like this was merged at an earlier revision than the final one, meaning one of the text fixes never made it in, so we may want to remerge this.

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:

Bill Filler

IRIE Shinsuke

Michael Sheldon

Thomas Moenicke

kokoye2007 

 === modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
 --- data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-01-14 12:07:03 +0000
 +++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-02-10 13:49:43 +0000
@@ -6,6 +6,11 @@
        <description>Currently active language, selected by user in the keyboard language menu</description>
        <default>'en'</default>
      </key>
++    <key name="previous-language" type="s">
++      <summary>Previous language</summary>
++      <description>Language which was in use immediately prior to the current active language</description>
++      <default>''</default>
++    </key>
      <key name="enabled-languages" type="as">
        <summary>Enabled languages</summary>
        <description>User-defined list of activatable languages.</description>
 === modified file 'qml/Keyboard.qml'
 --- qml/Keyboard.qml	2015-01-15 13:24:57 +0000
 +++ qml/Keyboard.qml	2015-02-10 13:49:43 +0000
@@ -191,11 +191,12 @@
                          LanguageMenu {
                              id: languageMenu
++                            objectName: "languageMenu"
                              anchors.centerIn: parent
--                            width: 400;
--                            height: keypad.height;
++                            height: contentHeight > keypad.height ? keypad.height : contentHeight
++                            width: units.gu(30);
                              enabled: canvas.languageMenuShown
--                            opacity: canvas.languageMenuShown ? 1.0 : 0.0
++                            visible: canvas.languageMenuShown
+                         }
                      } // keyboardComp
+                 }
@@ -261,9 +262,9 @@
+                 }
                  onKeyboardReset: {
                      keypad.state = "CHARACTERS"
--                    if (keypad.switchBack && keypad.previousLanguage && !keypad.justChangedLanguage) {
++                    if (keypad.switchBack && maliit_input_method.previousLanguage && !keypad.justChangedLanguage) {
                          keypad.switchBack = false;
--                        maliit_input_method.activeLanguage = keypad.previousLanguage;
++                        maliit_input_method.activeLanguage = maliit_input_method.previousLanguage;
+                     }
                      keypad.justChangedLanguage = false;
+                 }
 === modified file 'qml/KeyboardContainer.qml'
 --- qml/KeyboardContainer.qml	2015-01-15 13:24:57 +0000
 +++ qml/KeyboardContainer.qml	2015-02-10 13:49:43 +0000
@@ -33,8 +33,7 @@
      property string activeKeypadState: "NORMAL"
      property alias popoverEnabled: extendedKeysSelector.enabled
--    property string previousLanguage
--    property bool switchBack: false // Switch back to the previous layout without showing the language menu
++    property bool switchBack: false // Switch back to the previous layout when changing fields
      property bool justChangedLanguage: true // Don't switch back languages during language switch process
      state: "CHARACTERS"
 === modified file 'qml/keys/LanguageKey.qml'
 --- qml/keys/LanguageKey.qml	2015-01-12 13:30:44 +0000
 +++ qml/keys/LanguageKey.qml	2015-02-10 13:49:43 +0000
@@ -21,25 +21,46 @@
      iconShifted: "language-chooser";
      iconCapsLock: "language-chooser";
++    property bool held: false;
++
      padding: 0
--    visible: maliit_input_method.enabledLanguages.length > 1 ? true : false
--    width: visible ? panel.keyWidth : 0
++    width: panel.keyWidth
      overridePressArea: true
++    action: "language"
++
      onPressed: {
          if (maliit_input_method.useAudioFeedback)
              audioFeedback.play();
          if (maliit_input_method.useHapticFeedback)
              pressEffect.start();
--
--        if (panel.switchBack && panel.previousLanguage) {
--            panel.switchBack = false;
--            maliit_input_method.activeLanguage = panel.previousLanguage
++
++        held = false;
++    }
++
++    onReleased: {
++        panel.switchBack = false;
++        if (held) {
++            return;
++        }
++
++        if (maliit_input_method.previousLanguage && maliit_input_method.previousLanguage != maliit_input_method.activeLanguage) {
++            maliit_input_method.activeLanguage = maliit_input_method.previousLanguage
          } else {
--            panel.previousLanguage = maliit_input_method.activeLanguage
              canvas.languageMenuShown = true
+         }
--    }
++    }
++
++    onPressAndHold: {
++        if (maliit_input_method.useAudioFeedback)
++            audioFeedback.play();
++
++        if (maliit_input_method.useHapticFeedback)
++            pressEffect.start();
++
++        canvas.languageMenuShown = true
++        held = true;
++    }
+ }
 === modified file 'qml/keys/LanguageMenu.qml'
 --- qml/keys/LanguageMenu.qml	2014-12-05 00:49:11 +0000
 +++ qml/keys/LanguageMenu.qml	2015-02-10 13:49:43 +0000
@@ -22,6 +22,8 @@
  Item {
++    property double contentHeight: menuList.contentHeight + units.gu(UI.languageMenuListViewPadding);
++
      MouseArea {
          width: fullScreenItem.width
          height: fullScreenItem.height
@@ -49,6 +51,17 @@
          delegate: ListItem.Standard {
              text: languageIdToName(modelData)
++            showDivider: modelData != maliit_input_method.enabledLanguages[maliit_input_method.enabledLanguages.length - 1]
++            control: CheckBox {
++                checked: maliit_input_method.activeLanguage == modelData
++                onVisibleChanged: {
++                    checked = maliit_input_method.activeLanguage == modelData
++                }
++                onClicked: {
++                    maliit_input_method.activeLanguage = modelData
++                    canvas.languageMenuShown = false;
++                }
++            }
              onClicked: {
                  maliit_input_method.activeLanguage = modelData
                  canvas.languageMenuShown = false;
@@ -56,17 +69,25 @@
+         }
          Component {
--            id: settingsItem
++            id: settingsComp
++            Column {
++                width: parent.width
++                height: settingsItem.height + settingsDiv.height * 2
++                ListItem.ThinDivider { id: settingsDiv }
++                ListItem.ThinDivider { }
                  ListItem.Standard {
--                text: i18n.tr("Settings")
--                onClicked: {
--                    Qt.openUrlExternally("settings:///system/language")
--                    canvas.languageMenuShown = false;
--                    maliit_input_method.hide();
++                    id: settingsItem
++                    text: i18n.tr("Settings") + "…"
++                    showDivider: false
++                    onClicked: {
++                        Qt.openUrlExternally("settings:///system/language")
++                        canvas.languageMenuShown = false;
++                        maliit_input_method.hide();
++                    }
+                 }
+             }
+         }
--        footer: greeter_status.greeterActive ? null : settingsItem
++        footer: greeter_status.greeterActive ? null : settingsComp
+     }
      function languageIdToName(languageId)
 === modified file 'src/plugin/inputmethod.cpp'
 --- src/plugin/inputmethod.cpp	2015-02-02 18:18:07 +0000
 +++ src/plugin/inputmethod.cpp	2015-02-10 13:49:43 +0000
@@ -114,6 +114,7 @@
      d->registerAutoCapsSetting();
      d->registerWordEngineSetting();
      d->registerActiveLanguage();
++    d->registerPreviousLanguage();
      d->registerEnabledLanguages();
      d->registerDoubleSpaceFullStop();
      d->registerStayHidden();
@@ -283,6 +284,9 @@
+ {
      Q_D(InputMethod);
      d->enabledLanguages = d->m_settings.enabledLanguages();
++    if (!d->enabledLanguages.contains(d->previousLanguage)) {
++        setPreviousLanguage("");
++    }
      Q_EMIT enabledLanguagesChanged(d->enabledLanguages);
+ }
@@ -482,6 +486,14 @@
      return d->activeLanguage;
+ }
++//! \brief InputMethod::previousLanguage returns the language that was used
++//! immediately prior to the current activeLanguage
++const QString &InputMethod::previousLanguage() const
++{
++    Q_D(const InputMethod);
++    return d->previousLanguage;
++}
++
  //! \brief InputMethod::useAudioFeedback is true, when keys should play a audio
  //! feedback when pressed
  //! \return
@@ -531,6 +543,7 @@
      if (d->activeLanguage == newLanguage)
          return;
++    setPreviousLanguage(d->activeLanguage);
      d->activeLanguage = newLanguage;
      d->host->setLanguage(newLanguage);
      d->m_settings.setActiveLanguage(newLanguage);
@@ -539,6 +552,23 @@
      Q_EMIT activeLanguageChanged(d->activeLanguage);
+ }
++//! \brief InputMethod::setPreviousLanguage
++//! Set the language used immediately prior to the current active language.
++//! \param prevLanguage id the previous language used. e.g. "en" or "emoji"
++void InputMethod::setPreviousLanguage(const QString &prevLanguage)
++{
++    Q_D(InputMethod);
++
++    if (d->previousLanguage == prevLanguage)
++        return;
++
++    d->previousLanguage = prevLanguage;
++    d->m_settings.setPreviousLanguage(prevLanguage);
++
++    Q_EMIT previousLanguageChanged(d->previousLanguage);
++}
++
++
  void InputMethod::onWordEnginePluginChanged()
+ {
      reset();
 === modified file 'src/plugin/inputmethod.h'
 --- src/plugin/inputmethod.h	2014-11-26 15:02:05 +0000
 +++ src/plugin/inputmethod.h	2015-02-10 13:49:43 +0000
@@ -51,6 +51,7 @@
      Q_PROPERTY(TextContentType contentType READ contentType WRITE setContentType NOTIFY contentTypeChanged)
      Q_PROPERTY(QStringList enabledLanguages READ enabledLanguages NOTIFY enabledLanguagesChanged)
      Q_PROPERTY(QString activeLanguage READ activeLanguage WRITE setActiveLanguage NOTIFY activeLanguageChanged)
++    Q_PROPERTY(QString previousLanguage READ previousLanguage WRITE setPreviousLanguage NOTIFY previousLanguageChanged)
      Q_PROPERTY(bool useAudioFeedback READ useAudioFeedback NOTIFY useAudioFeedbackChanged)
      Q_PROPERTY(QString audioFeedbackSound READ audioFeedbackSound NOTIFY audioFeedbackSoundChanged)
      Q_PROPERTY(QObject* actionKeyOverride READ actionKeyOverride NOTIFY actionKeyOverrideChanged)
@@ -108,6 +109,9 @@
      const QString &activeLanguage() const;
      Q_SLOT void setActiveLanguage(const QString& newLanguage);
++    const QString &previousLanguage() const;
++    Q_SLOT void setPreviousLanguage(const QString& prevLanguage);
++
      Q_SLOT void onVisibleRectChanged();
      bool useAudioFeedback() const;
@@ -129,6 +133,7 @@
      void deactivateAutocaps();
      void enabledLanguagesChanged(QStringList languages);
      void activeLanguageChanged(QString language);
++    void previousLanguageChanged(QString language);
      void useAudioFeedbackChanged();
      void audioFeedbackSoundChanged(QString sound);
      void useHapticFeedbackChanged();
 === modified file 'src/plugin/inputmethod_p.h'
 --- src/plugin/inputmethod_p.h	2015-01-14 12:07:03 +0000
 +++ src/plugin/inputmethod_p.h	2015-02-10 13:49:43 +0000
@@ -55,6 +55,7 @@
      bool wordEngineEnabled;
      InputMethod::TextContentType contentType;
      QString activeLanguage;
++    QString previousLanguage;
      QStringList enabledLanguages;
      Qt::ScreenOrientation appsCurrentOrientation;
      QString keyboardState;
@@ -80,6 +81,7 @@
          , wordEngineEnabled(false)
          , contentType(InputMethod::FreeTextContentType)
          , activeLanguage("en")
++        , previousLanguage("")
          , enabledLanguages(activeLanguage)
          , appsCurrentOrientation(qGuiApp->primaryScreen()->orientation())
          , keyboardState("CHARACTERS")
@@ -238,6 +240,15 @@
          q->setActiveLanguage(activeLanguage);
+     }
++    void registerPreviousLanguage()
++    {
++        QObject::connect(&m_settings, SIGNAL(previousLanguageChanged(QString)),
++                         q, SLOT(setPreviousLanguage(QString)));
++
++        previousLanguage = m_settings.previousLanguage();
++        q->setPreviousLanguage(previousLanguage);
++    }
++
      void registerEnabledLanguages()
+     {
          QObject::connect(&m_settings, SIGNAL(enabledLanguagesChanged(QStringList)),
 === modified file 'src/plugin/keyboardsettings.cpp'
 --- src/plugin/keyboardsettings.cpp	2015-01-14 12:07:03 +0000
 +++ src/plugin/keyboardsettings.cpp	2015-02-10 13:49:43 +0000
@@ -35,6 +35,7 @@
  using namespace MaliitKeyboard;
  const QLatin1String ACTIVE_LANGUAGE_KEY = QLatin1String("activeLanguage");
++const QLatin1String PREVIOUS_LANGUAGE_KEY = QLatin1String("previousLanguage");
  const QLatin1String ENABLED_LANGUAGES_KEY = QLatin1String("enabledLanguages");
  const QLatin1String AUTO_CAPITALIZATION_KEY = QLatin1String("autoCapitalization");
  const QLatin1String AUTO_COMPLETION_KEY = QLatin1String("autoCompletion");
@@ -76,6 +77,22 @@
+ }
  /*!
++ * \brief KeyboardSettings::previousLanguage returns the language that was
++ * active immediately before the current one.
++ * \return previously language
++ */
++
++QString KeyboardSettings::previousLanguage() const
++{
++    return m_settings->get(PREVIOUS_LANGUAGE_KEY).toString();
++}
++
++void KeyboardSettings::setPreviousLanguage(const QString& id)
++{
++    m_settings->set(PREVIOUS_LANGUAGE_KEY, QVariant(id));
++}
++
++/*!
   * \brief KeyboardSettings::enabledLanguages returns a list of languages that are
   * active
   * \return
@@ -182,6 +199,9 @@
      if (key == ACTIVE_LANGUAGE_KEY) {
          Q_EMIT activeLanguageChanged(activeLanguage());
          return;
++    } else if (key == PREVIOUS_LANGUAGE_KEY) {
++        Q_EMIT previousLanguageChanged(previousLanguage());
++        return;
      } else if (key == ENABLED_LANGUAGES_KEY) {
          Q_EMIT enabledLanguagesChanged(enabledLanguages());
          return;
 === modified file 'src/plugin/keyboardsettings.h'
 --- src/plugin/keyboardsettings.h	2015-01-14 12:07:03 +0000
 +++ src/plugin/keyboardsettings.h	2015-02-10 13:49:43 +0000
@@ -45,6 +45,8 @@
      QString activeLanguage() const;
      void setActiveLanguage(const QString& id);
++    QString previousLanguage() const;
++    void setPreviousLanguage(const QString& id);
      QStringList enabledLanguages() const;
      bool autoCapitalization() const;
      bool autoCompletion() const;
@@ -58,6 +60,7 @@
  Q_SIGNALS:
      void activeLanguageChanged(QString);
++    void previousLanguageChanged(QString);
      void enabledLanguagesChanged(QStringList);
      void autoCapitalizationChanged(bool);
      void autoCompletionChanged(bool);
 === modified file 'tests/autopilot/ubuntu_keyboard/emulators/keypad.py'
 --- tests/autopilot/ubuntu_keyboard/emulators/keypad.py	2014-11-18 12:39:54 +0000
 +++ tests/autopilot/ubuntu_keyboard/emulators/keypad.py	2015-02-10 13:49:43 +0000
@@ -55,5 +55,6 @@
          _iter_keys("CharKey", lambda x: x.label)
          _iter_keys("ActionKey", lambda x: x.action)
          _iter_keys("ShiftKey", lambda x: x.action)
++        _iter_keys("LanguageKey", lambda x: x.action)
          return (contained_keys, key_positions)
 === modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
 --- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-02-02 18:17:42 +0000
 +++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-02-10 13:49:43 +0000
@@ -61,12 +61,14 @@
              self.skipTest("Ubuntu Keyboard tests only run on device.")
          super(UbuntuKeyboardTests, self).setUp()
          self.set_test_settings()
++        sleep(1) # Have to give time for gsettings change to propogate
          self.pointer = Pointer(Touch.create())
      def set_test_settings(self):
          gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
++        gsettings.set_strv("enabled-languages", ["en", "es", "de", "zh", "emoji"])
          gsettings.set_string("active-language", "en")
--        gsettings.set_strv("enabled-languages", ["en", "es", "de", "zh", "emoji"])
++        gsettings.set_string("previous-language", "es")
          gsettings.set_boolean("auto-capitalization", True)
          gsettings.set_boolean("auto-completion", True)
          gsettings.set_boolean("predictive-text", True)
@@ -158,11 +160,7 @@
              TextField {
                  id: input;
                  objectName: "input"
--                anchors {
--                    top: inputLabel.bottom
--                    horizontalCenter: parent.horizontalCenter
--                    topMargin: 10
--                }
++                anchors.centerIn: parent
                  inputMethodHints: %(input_method)s
+             }
+         }
@@ -377,6 +375,7 @@
              TextField {
                  id: input;
                  objectName: "input"
++                anchors.centerIn: parent
                  property int visibilityChangeCount: 0
+             }
@@ -746,6 +745,8 @@
      def set_test_settings(self):
          gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
++        gsettings.set_strv("enabled-languages", ["en", "emoji"])
++        gsettings.set_string("previous-language", "emoji")
          gsettings.set_string("active-language", "emoji")
          gsettings.set_boolean("auto-capitalization", True)
          gsettings.set_boolean("auto-completion", True)
@@ -759,6 +760,12 @@
          keyboard = Keyboard()
          self.addCleanup(keyboard.dismiss)
++        keyboard.press_key("language")
++
++        sleep(1)
++
++        keyboard = Keyboard()
++
          keyboard.type('😁😆😃😏')
          expected = "😁😆😃😏"
@@ -777,6 +784,12 @@
          keyboard = Keyboard()
          self.addCleanup(keyboard.dismiss)
++        keyboard.press_key("language")
++
++        sleep(1)
++
++        keyboard = Keyboard()
++
          keyboard.type('😁😆😃😏\b')
          expected = "😁😆😃"
@@ -786,6 +799,63 @@
+         )
++class UbuntuKeyboardLanguageMenu(UbuntuKeyboardTests):
++
++    def test_tapping(self):
++        """Tapping the language menu key should switch to the previously
++        used language.
++
++        """
++
++        text_area = self.launch_test_input_area()
++        self.ensure_focus_on_input(text_area)
++        keyboard = Keyboard()
++        self.addCleanup(keyboard.dismiss)
++
++        gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
++        self.assertThat(
++            gsettings.get_string("active-language"),
++            Equals('en')
++        )
++
++        keyboard.press_key("language")
++
++        sleep(5)
++
++        self.assertThat(
++            gsettings.get_string("active-language"),
++            Equals('es')
++        )
++
++    def test_long_press(self):
++        """Holding down the language menu key should switch display the
++        language switcher menu.
++
++        """
++
++        text_area = self.launch_test_input_area()
++        self.ensure_focus_on_input(text_area)
++        keyboard = Keyboard()
++        self.addCleanup(keyboard.dismiss)
++
++        gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
++        self.assertThat(
++            gsettings.get_string("active-language"),
++            Equals('en')
++        )
++
++        keyboard.press_key("language", long_press=True)
++
++        menu = keyboard.maliit.select_single("LanguageMenu")
++
++        self.assertThat(
++            menu.visible,
++            Eventually(Equals(True))
++        )
++
++        keyboard.press_key("language")
++
++
  def maliit_cleanup():
      presagedir = os.path.expanduser("~/.presage")
      if os.path.exists(presagedir + ".bak") and os.path.exists(presagedir):