Unity 8

Merge lp:~dandrader/unity8/mirSurfaceInputBounds into lp:unity8

mirSurfaceInputBounds
Merge into trunk

Proposed by Daniel d'Andrada on 2016-06-30

Status:	Merged
Approved by:	Michael Zanetti on 2016-07-06
Approved revision:	2527
Merged at revision:	2543
Proposed branch:	lp:~dandrader/unity8/mirSurfaceInputBounds
Merge into:	lp:unity8
Diff against target:	563 lines (+86/-186) (has conflicts) 17 files modified CMakeLists.txt (+1/-1) debian/changelog (+9/-0) debian/control (+4/-3) qml/Components/InputMethod.qml (+8/-44) qml/Shell.qml (+1/-1) qml/Stages/DesktopStage.qml (+5/-1) tests/mocks/Unity/Application/CMakeLists.txt (+0/-1) tests/mocks/Unity/Application/MirSurface.cpp (+21/-0) tests/mocks/Unity/Application/MirSurface.h (+8/-0) tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp (+0/-58) tests/mocks/Unity/Application/UbuntuKeyboardInfo.h (+0/-57) tests/mocks/Unity/Application/VirtualKeyboard.cpp (+20/-1) tests/mocks/Unity/Application/VirtualKeyboard.h (+4/-1) tests/mocks/Unity/Application/plugin.cpp (+0/-8) tests/mocks/Unity/Application/resources/VirtualKeyboard.qml (+1/-6) tests/qmltests/Stages/tst_DesktopStage.qml (+3/-3) tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1) Text conflict in debian/changelog
To merge this branch:	bzr merge lp:~dandrader/unity8/mirSurfaceInputBounds
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-06-30	Needs Fixing on 2016-07-18
Michał Sawicz	packaging		Approve on 2016-07-12
Unity8 CI Bot	continuous-integration	2016-06-30	Needs Fixing on 2016-07-06
Michael Zanetti (community)		2016-06-30	Approve on 2016-07-06
Review via email: mp+298780@code.launchpad.net

This proposal supersedes a proposal from 2016-06-29.

Commit Message

Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack

Description of the Change

All packages are in this silo: https://requests.ci-train.ubuntu.com/#/ticket/1525

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/qtubuntu/exposeMirSurface/+merge/296983
https://code.launchpad.net/~dandrader/unity-api/mirSurfaceInputBounds/+merge/296985
https://code.launchpad.net/~dandrader/qtmir/mirSurfaceInputBounds/+merge/296986
https://code.launchpad.net/~dandrader/ubuntu-keyboard/mirSurfaceInputBounds/+merge/296987

* 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?
Not applicable

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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-09: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-06-20: Posted in a previous version of this proposal

Text conflict in debian/control
1 conflicts encountered.

Daniel d'Andrada (dandrader) wrote on 2016-06-20: Posted in a previous version of this proposal

On 20/06/2016 04:24, Albert Astals Cid wrote:
> Text conflict in debian/control
> 1 conflicts encountered.
>
Fixed.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Gerry Boland (gerboland) wrote on 2016-06-22: Posted in a previous version of this proposal

Works for me.

review: Approve

Albert Astals Cid (aacid) wrote on 2016-06-29: Posted in a previous version of this proposal

Contents conflict in tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp
1 conflicts encountered.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-06-30: Posted in a previous version of this proposal

This moves all windows up when the OSK is shown. Should only move the focused one instead

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2016-06-30: Posted in a previous version of this proposal

Maximizing windows is broken

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2016-06-30: Posted in a previous version of this proposal

not sure if it's a good idea to change that away from appContainer. The appContainer might be moved around depending on other factors (launcher shown etc). Apart from the previously mentioned breakage in maximizing, this is probably gonna make things harder if we need to consider the appContainer *and* the visibleRect in the future... I would probably prefer that you don't refactor this stuff too much. Not only because this is conflicting already a lot with the unified staged stuff...

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

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-07-04:

Code looks ok. Thanks for reverting the refactor. As discussed on IRC, lets see how to get that in when the stages are merged. The issues with the window displacement are fixed now too.

However, for some reason this seems to break the OSK for apps when it is on the external screen (Tested with frieza plugged to a external HDMI screen). Text fields can't get focused any more. Could well be that it's not this branch, but instead another one from the silo. Can you please verify that?

review: Needs Information

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

On 04/07/2016 13:40, Michael Zanetti wrote:
> However, for some reason this seems to break the OSK for apps when it is on the external screen (Tested with frieza plugged to a external HDMI screen). Text fields can't get focused any more. Could well be that it's not this branch, but instead another one from the silo. Can you please verify that?

Reproduced with mako.

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

> Code looks ok. Thanks for reverting the refactor. As discussed on IRC, lets
> see how to get that in when the stages are merged. The issues with the window
> displacement are fixed now too.
>
>
> However, for some reason this seems to break the OSK for apps when it is on
> the external screen (Tested with frieza plugged to a external HDMI screen).
> Text fields can't get focused any more. Could well be that it's not this
> branch, but instead another one from the silo. Can you please verify that?

Turns out to be a mir bug (https://bugs.launchpad.net/mir/+bug/1598936). Added a workaround for it in the qtmir branch (http://bazaar.launchpad.net/~dandrader/qtmir/mirSurfaceInputBounds/revision/522).

Works fine now.

Michał Sawicz (saviq) wrote on 2016-07-06:

Text conflict in qml/Stages/DesktopStage.qml
1 conflicts encountered.

review: Needs Fixing

lp:~dandrader/unity8/mirSurfaceInputBounds updated on 2016-07-06

2527. By Daniel d'Andrada on 2016-07-06

Merge trunk

[ Michael Zanetti ]
don't displace windows if the OSK is on another screen (LP:
#1598917)

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

On 06/07/2016 09:30, Michał Sawicz wrote:
> Review: Needs Fixing
>
> Text conflict in qml/Stages/DesktopStage.qml
> 1 conflicts encountered.

Fixed

Michael Zanetti (mzanetti) wrote on 2016-07-06:

ack, now looks and tests fine.

review: Approve

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

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/mirSurfaceInputBounds updated on 2016-07-12

2528. By Daniel d'Andrada on 2016-07-07: tst_Tutorial: Update test_oskDoesNotHideTutorial
2529. By Daniel d'Andrada on 2016-07-12: This new unity8 is not compatible with current/old ubuntu-keyboard
2530. By Daniel d'Andrada on 2016-07-12: Bump version

Michał Sawicz (saviq) on 2016-07-12:

review: Approve (packaging)

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

Text conflict in debian/changelog

review: Needs Fixing

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

> Text conflict in debian/changelog

I don't see any.

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:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-06-27 18:41:15 +0000
 +++ CMakeLists.txt	2016-07-12 11:51:50 +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=18)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=19)
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 === modified file 'debian/changelog'
 --- debian/changelog	2016-07-07 16:49:32 +0000
 +++ debian/changelog	2016-07-12 11:51:50 +0000
@@ -1,3 +1,4 @@
++<<<<<<< TREE
  unity8 (8.12+16.10.20160707-0ubuntu1) yakkety; urgency=medium
    [ Michael Zanetti ]
@@ -6,6 +7,14 @@
   -- Michał Sawicz <michal.sawicz@canonical.com>  Thu, 07 Jul 2016 16:49:32 +0000
++=======
++unity8 (8.13) UNRELEASED; urgency=medium
++
++  * Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack
++
++ -- Daniel d'Andrada <daniel.dandrada@canonical.com>  Tue, 12 Jul 2016 08:49:26 -0300
++
++>>>>>>> MERGE-SOURCE
  unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium
    [ Michael Zanetti ]
 === modified file 'debian/control'
 --- debian/control	2016-06-27 18:44:35 +0000
 +++ debian/control	2016-07-12 11:51:50 +0000
@@ -33,7 +33,7 @@
                 libubuntugestures5-dev,
                 libubuntugestures5-private-dev,
                 libudev-dev,
--               libunity-api-dev (>= 7.115),
++               libunity-api-dev (>= 7.116),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!armhf],
@@ -124,6 +124,7 @@
  Breaks: indicator-network (<< 0.5.1+14.10.20141014),
          ubuntu-touch-session (<< 0.107),
          unity8-greeter (<< 7.89),
++        ubuntu-keyboard (<< 0.100),
  Replaces: ubuntu-touch-session (<< 0.82~),
            unity8-greeter (<< 7.89),
  Conflicts: ubuntu-system-settings-wizard,
@@ -138,7 +139,7 @@
           qtdeclarative5-ubuntu-settings-components (>= 0.7),
           qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
           ubuntu-thumbnailer-impl-0,
--         unity-application-impl-17,
++         unity-application-impl-19,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-12,
@@ -184,7 +185,7 @@
  Depends: ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-application-impl,
--          unity-application-impl-16,
++          unity-application-impl-19,
  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 'qml/Components/InputMethod.qml'
 --- qml/Components/InputMethod.qml	2016-05-05 17:20:10 +0000
 +++ qml/Components/InputMethod.qml	2016-07-12 11:51:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014,2015 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -16,13 +16,12 @@
  import QtQuick 2.4
  import Unity.Application 0.1
--import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  Item {
      id: root
--    property int transitionDuration: UbuntuAnimation.FastDuration
++    readonly property rect visibleRect: surfaceItem.surface ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
      MirSurfaceItem {
          id: surfaceItem
@@ -42,51 +41,16 @@
+     }
      TouchGate {
--        x: UbuntuKeyboardInfo.x
--        y: UbuntuKeyboardInfo.y
--        width: UbuntuKeyboardInfo.width
--        height: UbuntuKeyboardInfo.height
++        x: root.visibleRect.x
++        y: root.visibleRect.y
++        width: root.visibleRect.width
++        height: root.visibleRect.height
          targetItem: surfaceItem
+     }
--    state: {
--        if (surfaceItem.surface &&
++    visible: surfaceItem.surface &&
                surfaceItem.surfaceState != Mir.HiddenState &&
                surfaceItem.surfaceState != Mir.MinimizedState &&
--              root.enabled) {
--            return "shown";
--        } else {
--            return "hidden";
--        }
--    }
--
--    states: [
--        State {
--            name: "shown"
--            PropertyChanges {
--                target: root
--                visible: true
--                y: 0
--            }
--        },
--        State {
--            name: "hidden"
--            PropertyChanges {
--                target: root
--                visible: false
--                // half-way down because the vkb occupies only the lower half of the surface
--                // TODO: consider keyboard rotation
--                y: root.parent.height / 2.0
--            }
--        }
--    ]
--
--    transitions: [
--        Transition {
--            from: "*"; to: "*"
--            PropertyAction { property: "visible"; value: true }
--            UbuntuNumberAnimation { property: "y"; duration: transitionDuration }
--        }
--    ]
++              root.enabled
+ }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-07-05 09:57:08 +0000
 +++ qml/Shell.qml	2016-07-12 11:51:50 +0000
@@ -657,7 +657,7 @@
              paused: callManager.hasCalls || !greeter || greeter.shown ||
                      wizard.active
              delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
--                     inputMethod.state === "shown" ||
++                     inputMethod.visible ||
                       (launcher.shown && !launcher.lockedVisible) ||
                       panel.indicators.shown || stage.dragProgress > 0
              usageScenario: shell.usageScenario
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-07-05 09:57:08 +0000
 +++ qml/Stages/DesktopStage.qml	2016-07-12 11:51:50 +0000
@@ -156,6 +156,10 @@
+                 }
+             }
+         }
++
++        readonly property real virtualKeyboardHeight: SurfaceManager.inputMethodSurface
++                                                          ? SurfaceManager.inputMethodSurface.inputBounds.height
++                                                          : 0
+     }
      Connections {
@@ -273,7 +277,7 @@
                      property: "y"
                      value: appDelegate.requestedY -
                             Math.min(appDelegate.requestedY - PanelState.panelHeight,
--                                    Math.max(0, UbuntuKeyboardInfo.height - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))
++                                    Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))
                      when: root.oskEnabled && appDelegate.focus && appDelegate.state == "normal"
                            && SurfaceManager.inputMethodSurface
                            && SurfaceManager.inputMethodSurface.state != Mir.HiddenState
 === modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
 --- tests/mocks/Unity/Application/CMakeLists.txt	2016-04-04 13:37:49 +0000
 +++ tests/mocks/Unity/Application/CMakeLists.txt	2016-07-12 11:51:50 +0000
@@ -7,7 +7,6 @@
      MirSurfaceListModel.cpp
      ObjectListModel.h
      SurfaceManager.cpp
--    UbuntuKeyboardInfo.cpp
      VirtualKeyboard.cpp
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
 === modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2016-05-17 19:59:44 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	2016-07-12 11:51:50 +0000
@@ -87,6 +87,8 @@
      m_zombieTimer.setInterval(100);
      m_zombieTimer.setSingleShot(true);
      connect(&m_zombieTimer, &QTimer::timeout, this, [this](){ this->setLive(false); });
++
++    updateInputBoundsAfterResize();
+ }
  MirSurface::~MirSurface()
@@ -326,6 +328,13 @@
      if (changed) {
          Q_EMIT sizeChanged(QSize(width, height));
+     }
++
++    updateInputBoundsAfterResize();
++}
++
++void MirSurface::updateInputBoundsAfterResize()
++{
++    setInputBounds(QRect(0, 0, m_width, m_height));
+ }
  bool MirSurface::isSlowToResize() const
@@ -439,6 +448,18 @@
      return controller ? controller->focusedSurface() == this : false;
+ }
++QRect MirSurface::inputBounds() const
++{
++    return m_inputBounds;
++}
++
++void MirSurface::setInputBounds(const QRect &boundsRect)
++{
++    if (boundsRect != m_inputBounds) {
++        m_inputBounds = boundsRect;
++        Q_EMIT inputBoundsChanged(m_inputBounds);
++    }
++}
  #if MIRSURFACE_DEBUG
  #undef DEBUG_MSG
  #define DEBUG_MSG(params) qDebug().nospace() << "MirFocusController::" << __func__  << " " << params
 === modified file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2016-05-27 13:52:52 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	2016-07-12 11:51:50 +0000
@@ -102,6 +102,7 @@
      Mir::ShellChrome shellChrome() const override;
      bool focused() const override;
++    QRect inputBounds() const override;
      Q_INVOKABLE void requestFocus() override;
@@ -128,6 +129,8 @@
      Q_INVOKABLE void setWidthIncrement(int);
      Q_INVOKABLE void setHeightIncrement(int);
++    Q_INVOKABLE virtual void setInputBounds(const QRect &boundsRect);
++
      /////
      // internal mock stuff
@@ -160,6 +163,9 @@
      void raiseRequested();
      void closeRequested();
++protected:
++    virtual void updateInputBoundsAfterResize();
++
  private Q_SLOTS:
      void applyDelayedResize();
@@ -202,6 +208,8 @@
      QHash<qintptr, View> m_views;
      QTimer m_zombieTimer;
++
++    QRect m_inputBounds;
  };
  #endif // MOCK_MIR_SURFACE_H
 === removed file 'tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp'
 --- tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp	2016-06-23 10:31:11 +0000
 +++ tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
--/*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it under
-- * the terms of the GNU Lesser General Public License version 3, as published by
-- * the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "UbuntuKeyboardInfo.h"
--
--UbuntuKeyboardInfo::UbuntuKeyboardInfo(QObject *parent)
--    : QObject(parent),
--    m_x(0),
--    m_y(0),
--    m_width(200),
--    m_height(0)
--{
--}
--
--void UbuntuKeyboardInfo::setX(qreal value)
--{
--    if (value != m_x) {
--        m_x = value;
--        Q_EMIT xChanged(m_x);
--    }
--}
--
--void UbuntuKeyboardInfo::setY(qreal value)
--{
--    if (value != m_y) {
--        m_y = value;
--        Q_EMIT yChanged(m_y);
--    }
--}
--
--void UbuntuKeyboardInfo::setWidth(qreal value)
--{
--    if (value != m_width) {
--        m_width = value;
--        Q_EMIT widthChanged(m_width);
--    }
--}
--
--void UbuntuKeyboardInfo::setHeight(qreal value)
--{
--    if (value != m_height) {
--        m_height = value;
--        Q_EMIT heightChanged(m_height);
--    }
--}
 === removed file 'tests/mocks/Unity/Application/UbuntuKeyboardInfo.h'
 --- tests/mocks/Unity/Application/UbuntuKeyboardInfo.h	2016-04-14 11:46:04 +0000
 +++ tests/mocks/Unity/Application/UbuntuKeyboardInfo.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
--/*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it under
-- * the terms of the GNU Lesser General Public License version 3, as published by
-- * the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef UBUNTU_KEYBOARD_INFO_H
--#define UBUNTU_KEYBOARD_INFO_H
--
--#include <QLocalSocket>
--#include <QTimer>
--
--class UbuntuKeyboardInfo : public QObject {
--    Q_OBJECT
--    Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged)
--    Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged)
--    Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged)
--    Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY heightChanged)
--public:
--    UbuntuKeyboardInfo(QObject *parent = 0);
--    virtual ~UbuntuKeyboardInfo() {}
--    qreal x() const { return m_x; }
--    qreal y() const { return m_y; }
--    qreal width() const { return m_width; }
--    qreal height() const { return m_height; }
--
--    // Just in the fake implementation
--    void setX(qreal value);
--    void setY(qreal value);
--    void setWidth(qreal value);
--    void setHeight(qreal value);
--
--Q_SIGNALS:
--    void xChanged(qreal x);
--    void yChanged(qreal y);
--    void widthChanged(qreal width);
--    void heightChanged(qreal height);
--
--private:
--    QLocalSocket m_socket;
--    qint32 m_x;
--    qint32 m_y;
--    qint32 m_width;
--    qint32 m_height;
--};
--
--#endif // UBUNTU_KEYBOARD_INFO_H
 === modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
 --- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2016-04-13 18:33:15 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	2016-07-12 11:51:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015,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
@@ -34,3 +34,22 @@
  VirtualKeyboard::~VirtualKeyboard()
+ {
+ }
++
++void VirtualKeyboard::updateInputBoundsAfterResize()
++{
++    int width = this->width();
++
++    int height;
++    if (this->width() > this->height()) {
++        // landscape
++        height = this->height() * 0.4;
++    } else {
++        // portrait
++        height = this->width() * 0.6;
++    }
++
++    int x = 0;
++    int y = this->height() - height;
++
++    setInputBounds(QRect(x, y, width, height));
++}
 === modified file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
 --- tests/mocks/Unity/Application/VirtualKeyboard.h	2016-04-13 18:33:15 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.h	2016-07-12 11:51:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015,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
@@ -27,6 +27,9 @@
  public:
      explicit VirtualKeyboard();
      ~VirtualKeyboard();
++
++protected:
++    void updateInputBoundsAfterResize() override;
  };
  Q_DECLARE_METATYPE(VirtualKeyboard*)
 === modified file 'tests/mocks/Unity/Application/plugin.cpp'
 --- tests/mocks/Unity/Application/plugin.cpp	2016-04-14 11:46:04 +0000
 +++ tests/mocks/Unity/Application/plugin.cpp	2016-07-12 11:51:50 +0000
@@ -19,7 +19,6 @@
  #include "ApplicationManager.h"
  #include "MirSurfaceItem.h"
  #include "SurfaceManager.h"
--#include "UbuntuKeyboardInfo.h"
  // unity-api
  #include <unity/shell/application/Mir.h>
@@ -53,12 +52,6 @@
      return SurfaceManager::instance();
+ }
--QObject* ubuntuKeyboardInfoSingleton(QQmlEngine*, QJSEngine*)
--{
--    createUnityApplicationSharedSingletons();
--    return new UbuntuKeyboardInfo;
--}
--
  QObject* mirFocusControllerSingleton(QQmlEngine*, QJSEngine*)
+ {
      createUnityApplicationSharedSingletons();
@@ -86,7 +79,6 @@
      qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
      qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
--    qmlRegisterSingletonType<UbuntuKeyboardInfo>(uri, 0, 1, "UbuntuKeyboardInfo", ubuntuKeyboardInfoSingleton);
      qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values, it can't be instantiated");
+ }
 === modified file 'tests/mocks/Unity/Application/resources/VirtualKeyboard.qml'
 --- tests/mocks/Unity/Application/resources/VirtualKeyboard.qml	2015-09-29 12:28:10 +0000
 +++ tests/mocks/Unity/Application/resources/VirtualKeyboard.qml	2016-07-12 11:51:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014-2015 Canonical Ltd.
++ * Copyright 2014-2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -38,9 +38,4 @@
              anchors.fill: parent
+         }
+     }
--
--    Binding { target: UbuntuKeyboardInfo; property: "x"; value: screenshotImage.x}
--    Binding { target: UbuntuKeyboardInfo; property: "y"; value: screenshotImage.y}
--    Binding { target: UbuntuKeyboardInfo; property: "width"; value: screenshotImage.width}
--    Binding { target: UbuntuKeyboardInfo; property: "height"; value: screenshotImage.height}
+ }
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2016-07-05 09:57:08 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-07-12 11:51:50 +0000
@@ -534,14 +534,14 @@
              verify(dashAppDelegate);
              dashAppDelegate.requestedHeight = data.windowHeight;
              dashAppDelegate.requestedY = data.windowY;
--            UbuntuKeyboardInfo.height = 0;
++            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
              var initialY = dashAppDelegate.y;
              verify(initialY > PanelState.panelHeight);
--            UbuntuKeyboardInfo.height = root.height / 2;
++            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, root.height / 2, root.width, root.height / 2));
              tryCompare(dashAppDelegate, "y", data.targetDisplacement);
--            UbuntuKeyboardInfo.height = 0;
++            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
              tryCompare(dashAppDelegate, "y", initialY);
              SurfaceManager.inputMethodSurface.state = oldOSKState;
+         }
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2016-06-10 14:36:50 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2016-07-12 11:51:50 +0000
@@ -715,7 +715,7 @@
              surface.setState(Mir.RestoredState);
              var inputMethod = findInvisibleChild(shell, "inputMethod");
--            tryCompare(inputMethod, "state", "shown");
++            tryCompare(inputMethod, "visible", true);
              verify(tutorialLeftLoader.shown);
+         }