Merge lp:~thomas-moenicke/phablet-extras/maliit-plugins-content-orientation into lp:phablet-extras/maliit-plugins

[Thomas Moenicke]

switched to content-orientation changes for orientation handling. For testing

switched to content-orientation changes for orientation handling.

For testing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2134
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/89/rebuild

review: Approve (continuous-integration)

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-content-orientation]

2135. By Thomas Moenicke on 2013-07-24

translating maliit angle to Qt::ScreenOrientation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2135
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/90/rebuild

review: Approve (continuous-integration)

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-content-orientation]

2136. By Thomas Moenicke on 2013-07-25

forwaring contentOrientation to the rotationHelper QML Item

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2136
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/92/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

it requires the patch from Florian. I have tested with a test app and phone-app, where it rotates. In the shell, apps -> search lens it does not rotate, because it does not support rotation.

[Bill Filler (bfiller)]

Doesn't work for me. The keyboard never rotates. I'm using the latest maliit-framework that is now in archive:
maliit-framework 0.99.0+git20130615+97e8335-0ubuntu2
libmaliit-plugins0 0.99.0+git20130615+97e8335-0ubuntu2

Using this deb. And using Florian's patch + the changes you proposed to it Thomas. I made an MR for that and installed the deb from here:
https://code.launchpad.net/~bfiller/ubuntu-ui-toolkit/ubuntu-sdk-report-content-orientation/+merge/177048

The behavior I see is keyboard never rotate.

review: Needs Fixing

[Bill Filler (bfiller)]

tested with browser and notes and keyboard doesn't rotate when the apps rotate

[Thomas Moenicke (thomas-moenicke)]

The app guys probably need to use or adapt to the API. If they use the component from Florian, a MainWindow() without doing any magic, it should work.
I have tested it with the phone-app and a test app where it works. I have noticed it does not work for the browser, so we need to ping Olivier about this.

[Thomas Moenicke (thomas-moenicke)]

I fixed it for the Webbrowser. Unfort. I get an error from LP when doing a MR:
https://code.launchpad.net/~thomas-moenicke/phablet-extras/webbrowser-app-content-orientation

What happens here is the following: the property contentOrientation is a property of QWindow and can be set as shown in this QML example:

Window {
  contentOrientation: like Screen.orientation
}

The browser app has such a component instantiated. Not all apps do, that's where Florian's patch comes in: it exposes the window to QML space so people can set the property even if they don't have a Window {}. The OrientationHelper does that automatically.
If a Window {} is present, it should be set there to make it work.

[Thomas Moenicke (thomas-moenicke)]

update MR: https://code.launchpad.net/~thomas-moenicke/webbrowser-app/content-orientation/+merge/177133

[Thomas Moenicke (thomas-moenicke)]

https://code.launchpad.net/~osomon/webbrowser-app/contentOrientation/+merge/177390 - merged
https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/content_orientation_bis/+merge/177367 - merged
https://code.launchpad.net/~amanzi-team/notes-app/notes-app-main-window-name/+merge/177428 - top-approve pending

[Bill Filler (bfiller)]

Couple of remaining issues:
1) remove all the temp ifdefs from the code
2) A bigger issue is that with all the MR's from above installed I'm seeing the keyboard not repainted/layout properly after rotating back and forth. The buttons are the wrong size and don't fit correctly on the screen. Please ensure to do a complete relayout/resize after getting the rotation event.

review: Needs Fixing

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-content-orientation]

2137. By Thomas Moenicke on 2013-07-30

merge against master branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2137
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/49

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/97/rebuild

review: Approve (continuous-integration)

[lp:~thomas-moenicke/phablet-extras/maliit-plugins-content-orientation]

2138. By Thomas Moenicke on 2013-07-30

- fixed issue when rotating: sometimes the layout seemed to be calculated in a wrong way. This happened because osk
got the signal contentOrientationChanged(), but parts of the calculating code used the API of the primary screen do determine the current orientation.
This was not in sync with contentOrientation and lead to calculating keysizes/margins for portrait mode instead of landscape mode.
- caching values of calculations
- removed TEMP_DISABLED code

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2138
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/50

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/98/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2138
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-plugins-saucy-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-plugins-ci/99/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

Seems to work fine

[Günter Schwann (schwann)]

code looks good as well

review: Approve

[Thomas Moenicke (thomas-moenicke)]

succ. tested on 20130731 with this package and webbrowser package from the MR mentioned above
Notes-App does rotate as expected, Webbrowser does rotate as expected, shell does not rotate as expected

review: Approve

=== modified file 'maliit-keyboard/lib/logic/dynamiclayout.cpp'
--- maliit-keyboard/lib/logic/dynamiclayout.cpp	2013-06-17 10:53:15 +0000
+++ maliit-keyboard/lib/logic/dynamiclayout.cpp	2013-07-30 16:18:26 +0000
@@ -36,30 +36,37 @@
 QVector<int> DynamicLayout::calculateMargins(LayoutHelper::Orientation orientation,
                               Keyboard& kb)
 {
-    const qreal keyboardWidth = uiConst->windowGeometryRect(qGuiApp->primaryScreen()->orientation()).size().width();
-
-    QVector<int> margins;
-
-    int spaceTakenByKeys = 0;
-    int numberOfKeysInRow = 0;
-    for (int index = 0; index < kb.keys.count(); ++index) {
-        const KeyDescription &desc(kb.key_descriptions.at(index));
-        int width = uiConst->keyWidth(orientation, desc.width);
-        spaceTakenByKeys += width;
-        numberOfKeysInRow++;
-
-        bool at_row_end((index + 1 == kb.keys.count())
-                        || (index + 1 < kb.keys.count()
-                            && kb.key_descriptions.at(index + 1).row > desc.row));
-
-        if (at_row_end) {
-            int marginThisRow = ( (keyboardWidth - spaceTakenByKeys) / (numberOfKeysInRow-1) ) / 2;
-            margins.append(marginThisRow);
-            spaceTakenByKeys = 0;
+    if (d->marginsCachedOrientation != orientation)
+        d->invalidateMarginsCache();
+
+    if (!d->marginsCacheValid) {
+        const qreal keyboardWidth = windowWidth(orientation);
+
+        QVector<int> margins;
+        int spaceTakenByKeys = 0;
+        int numberOfKeysInRow = 0;
+        for (int index = 0; index < kb.keys.count(); ++index) {
+            const KeyDescription &desc(kb.key_descriptions.at(index));
+            int width = uiConst->keyWidth(orientation, desc.width);
+            spaceTakenByKeys += width;
+            numberOfKeysInRow++;
+
+            bool at_row_end((index + 1 == kb.keys.count())
+                            || (index + 1 < kb.keys.count()
+                                && kb.key_descriptions.at(index + 1).row > desc.row));
+
+            if (at_row_end) {
+                int marginThisRow = ( (keyboardWidth - spaceTakenByKeys) / (numberOfKeysInRow-1) ) / 2;
+                d->marginsCached.append(marginThisRow);
+                spaceTakenByKeys = 0;
+            }
         }
+
+        d->marginsCachedOrientation = orientation;
+        d->marginsCacheValid = true;
     }
 
-    return margins;
+    return d->marginsCached;
 }
 
 void DynamicLayout::calculateNumberOfRows(Keyboard& kb)
@@ -90,27 +97,39 @@
     d->initDynamicLayout();
 }
 
+int DynamicLayout::windowWidth(LayoutHelper::Orientation orientation)
+{
+    return d->storage(orientation)->windowGeometryRect.width();
+}
+
 QRect DynamicLayout::windowGeometryRect(Qt::ScreenOrientation orientation)
 {
-    LayoutHelper::Orientation maliitOrientation = LayoutHelper::Landscape;
-
-    if (orientation == Qt::PortraitOrientation || orientation == Qt::InvertedPortraitOrientation)
+    if (orientation != d->cachedOrientation)
+        d->invalidateWindowGeometryCache();
+
+    if ( !d->windowGeometryCacheValid ) {
+        LayoutHelper::Orientation maliitOrientation = LayoutHelper::Landscape;
+
+        if (orientation == Qt::PortraitOrientation || orientation == Qt::InvertedPortraitOrientation)
             maliitOrientation = LayoutHelper::Portrait;
 
-    if (orientation == Qt::InvertedLandscapeOrientation || orientation == Qt::InvertedPortraitOrientation) {
-        if (!d->wordRibbonEnabled) {
-            return d->storage(maliitOrientation)->windowGeometryRectInverted
+        if (orientation == Qt::InvertedLandscapeOrientation || orientation == Qt::InvertedPortraitOrientation) {
+            if (!d->wordRibbonEnabled) {
+                return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRectInverted
                         .adjusted  (0, wordRibbonHeight(maliitOrientation), 0, 0)
-                        .translated(0,-wordRibbonHeight(maliitOrientation));
-        } else {
-            return d->storage(maliitOrientation)->windowGeometryRectInverted;
+                        .translated(0,-wordRibbonHeight(maliitOrientation)) );
+            } else {
+                return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRectInverted );
+            }
         }
+
+        if (!d->wordRibbonEnabled)
+            return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRect.adjusted(0, d->storage(maliitOrientation)->wordRibbonHeight, 0, 0) );
+
+        return d->writeCache( orientation, d->storage(maliitOrientation)->windowGeometryRect );
     }
 
-    if (!d->wordRibbonEnabled)
-        return d->storage(maliitOrientation)->windowGeometryRect.adjusted(0, d->storage(maliitOrientation)->wordRibbonHeight, 0, 0);
-
-    return d->storage(maliitOrientation)->windowGeometryRect;
+    return d->windowGeometryRectCached;
 }
 
 qreal DynamicLayout::keyWidth(LayoutHelper::Orientation orientation, KeyDescription::Width requestedSize)
@@ -285,7 +304,10 @@
 
 void DynamicLayout::onWordEngineSettingsChanged(bool wordEngineEnabled)
 {
-    d->wordRibbonEnabled = wordEngineEnabled;
+    if (d->wordRibbonEnabled != wordEngineEnabled) {
+        d->wordRibbonEnabled = wordEngineEnabled;
+        d->invalidateWindowGeometryCache();
+    }
 }
 
 }} // namespaces

=== modified file 'maliit-keyboard/lib/logic/dynamiclayout.h'
--- maliit-keyboard/lib/logic/dynamiclayout.h	2013-06-17 10:53:15 +0000
+++ maliit-keyboard/lib/logic/dynamiclayout.h	2013-07-30 16:18:26 +0000
@@ -51,6 +51,7 @@
     void initDynamicLayout();
 
     int keypadHeight(LayoutHelper::Orientation orientation);
+    int windowWidth(LayoutHelper::Orientation orientation);
     QRect windowGeometryRect(Qt::ScreenOrientation orientation);
     qreal keyboardScreenWidthRatio(LayoutHelper::Orientation orientation);
 

=== modified file 'maliit-keyboard/lib/logic/dynamiclayout_p.h'
--- maliit-keyboard/lib/logic/dynamiclayout_p.h	2013-07-04 10:57:47 +0000
+++ maliit-keyboard/lib/logic/dynamiclayout_p.h	2013-07-30 16:18:26 +0000
@@ -1,5 +1,7 @@
 
-//#include "dynamiclayout.h"
+#include <QtCore>
+
+#include "layouthelper.h"
 
 namespace MaliitKeyboard {
 namespace Logic {
@@ -97,6 +99,15 @@
     bool initialized;
     bool wordRibbonEnabled;
 
+    // short term-caching in memory
+    Qt::ScreenOrientation cachedOrientation;
+    bool windowGeometryCacheValid;
+    QRect windowGeometryRectCached;
+
+    LayoutHelper::Orientation marginsCachedOrientation;
+    bool marginsCacheValid;
+    QVector<int> marginsCached;
+
     DynamicLayoutStorage* portraitStorage;
     DynamicLayoutStorage* landscapeStorage;
     DynamicLayoutStorage* genericStorage;
@@ -105,6 +116,15 @@
         q(_q),
         initialized(false),
         wordRibbonEnabled(false),
+
+        cachedOrientation(Qt::PortraitOrientation),
+        windowGeometryCacheValid(false),
+        windowGeometryRectCached(QRect(0,0,0,0)),
+
+        marginsCachedOrientation(LayoutHelper::Portrait),
+        marginsCacheValid(false),
+        marginsCached(0),
+
         portraitStorage(new DynamicLayoutStorage),
         landscapeStorage(new DynamicLayoutStorage),
         genericStorage(new DynamicLayoutStorage)
@@ -279,6 +299,22 @@
             qDebug() << "portrait inverted " << rInvertedPortrait << portraitStorage->windowGeometryRectInverted;
         }
     }
+
+    const QRect& writeCache( Qt::ScreenOrientation orientation, const QRect& cachedRect ) {
+        windowGeometryCacheValid = true;
+        cachedOrientation = orientation;
+        windowGeometryRectCached = cachedRect;
+        return windowGeometryRectCached;
+    }
+
+    void invalidateWindowGeometryCache() {
+        windowGeometryCacheValid = false;
+    }
+
+    void invalidateMarginsCache() {
+        marginsCacheValid = false;
+        marginsCached.clear();
+    }
 };
 
 }

=== modified file 'maliit-keyboard/lib/logic/keyareaconverter.cpp'
--- maliit-keyboard/lib/logic/keyareaconverter.cpp	2013-07-19 11:31:55 +0000
+++ maliit-keyboard/lib/logic/keyareaconverter.cpp	2013-07-30 16:18:26 +0000
@@ -86,7 +86,7 @@
 
     static const QMargins bg_margins( uiConst->keyAreaBorders() );
 
-    const qreal max_width( uiConst->windowGeometryRect(qGuiApp->primaryScreen()->orientation()).width() );
+    const qreal max_width( uiConst->windowWidth(orientation) );
     const qreal key_height(uiConst->keyHeight(orientation));
     const qreal keypadHeight = uiConst->keypadHeight(orientation);
 

=== modified file 'maliit-keyboard/plugin/inputmethod.cpp'
--- maliit-keyboard/plugin/inputmethod.cpp	2013-07-29 14:12:09 +0000
+++ maliit-keyboard/plugin/inputmethod.cpp	2013-07-30 16:18:26 +0000
@@ -172,7 +172,7 @@
 
     explicit InputMethodPrivate(InputMethod * const q,
                                 MAbstractInputMethodHost *host);
-    void setLayoutOrientation(Logic::LayoutHelper::Orientation orientation);
+    void setLayoutOrientation(Qt::ScreenOrientation qtOrientation);
     void updateKeyboardOrientation();
     void updateWordRibbon();
 
@@ -190,6 +190,7 @@
     , extended_surface(qSharedPointerDynamicCast<Surface>(surface_factory->create(g_extended_surface_options, surface)))
     , magnifier_surface(qSharedPointerDynamicCast<Surface>(surface_factory->create(g_extended_surface_options, surface)))
 #endif
+    , qmlRootItem(0)
     , editor(EditorOptions(), new Model::Text, new Logic::WordEngine, new Logic::LanguageFeatures)
     , feedback()
     , style(new Style)
@@ -263,7 +264,8 @@
     engine->addImportPath(MALIIT_KEYBOARD_DATA_DIR);
     setContextProperties(engine->rootContext());
 
-    view->setSource(QUrl::fromLocalFile(g_maliit_keyboard_qml));
+    QObject::connect(view, SIGNAL(statusChanged(QQuickView::Status)),
+                    q, SLOT(onQQuickViewStatusChanged(QQuickView::Status)));
 
 #ifdef EXTENDED_SURFACE_TEMP_DISABLED
     QQmlEngine *const extended_engine(extended_surface->view()->engine());
@@ -280,22 +282,6 @@
 #endif
     view->setProperty("role", 7);
 
-    qmlRootItem = view->rootObject();
-
-    QObject::connect(
-                qmlRootItem,
-                SIGNAL(hideAnimationFinishedChanged()),
-                q,
-                SLOT(onHideAnimationFinished()));
-
-    // workaround: contentOrientationChanged signal not fired by app/sdk
-    // http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
-    // this is normally handled by qmallitplatforminputcontextplugin in QtBase plugins
-    QObject::connect(view->screen(),
-                        SIGNAL(orientationChanged(Qt::ScreenOrientation)),
-                        q,
-                        SLOT(deviceOrientationChanged(Qt::ScreenOrientation)));
-
     // workaround: resizeMode not working in current qpa imlementation
     // http://qt-project.org/doc/qt-5.0/qtquick/qquickview.html#ResizeMode-enum
     view->setResizeMode(QQuickView::SizeRootObjectToView);
@@ -310,18 +296,20 @@
     updateKeyboardOrientation();
 }
 
-void InputMethodPrivate::setLayoutOrientation(Logic::LayoutHelper::Orientation orientation)
+void InputMethodPrivate::setLayoutOrientation(Qt::ScreenOrientation screenOrientation)
 {
+    Logic::LayoutHelper::Orientation orientation = uiConst->screenToMaliitOrientation(screenOrientation);
+
     layout.updater.setOrientation(orientation);
     extended_layout.updater.setOrientation(orientation);
 
-    windowGeometryRect = uiConst->windowGeometryRect(view->screen()->orientation());
+    windowGeometryRect = uiConst->windowGeometryRect( screenOrientation );
 
     keyboardVisibleRect = windowGeometryRect.adjusted(0,uiConst->invisibleTouchAreaHeight(orientation),0,0);
 
     // qpa does not rotate the coordinate system
     windowGeometryRect = qGuiApp->primaryScreen()->mapBetween(
-                    view->screen()->orientation(),
+                    screenOrientation,
                     qGuiApp->primaryScreen()->primaryOrientation(),
                     windowGeometryRect);
 
@@ -336,6 +324,8 @@
         host->setInputMethodArea(rect, view);
     }
 
+    qmlRootItem->setProperty("contentOrientation", screenOrientation);
+
 #ifdef HAVE_UBUNTU_PLATFORM_API
     if (qmlRootItem->property("shown").toBool()) {
         ubuntu_ui_report_osk_invisible();
@@ -366,7 +356,7 @@
 
 void InputMethodPrivate::updateKeyboardOrientation()
 {
-    setLayoutOrientation(uiConst->screenToMaliitOrientation(QGuiApplication::primaryScreen()->orientation()));
+    setLayoutOrientation(QGuiApplication::primaryScreen()->orientation());
 }
 
 void InputMethodPrivate::connectToNotifier()
@@ -396,6 +386,8 @@
 {
     Q_D(InputMethod);
 
+    d->view->setSource(QUrl::fromLocalFile(g_maliit_keyboard_qml));
+
     // FIXME: Reconnect feedback instance.
     Setup::connectAll(&d->layout.event_handler, &d->layout.updater, &d->editor);
     Setup::connectAll(&d->extended_layout.event_handler, &d->extended_layout.updater, &d->editor);
@@ -585,12 +577,22 @@
 
 void InputMethod::handleAppOrientationChanged(int angle)
 {
-    Q_UNUSED(angle);
-
-#ifdef DISABLED_AS_CONTENT_ORIENTATION_NOT_WORKING
     Q_D(InputMethod);
-    d->updateKeyboardOrientation();
-#endif
+
+    Qt::ScreenOrientation orientation = Qt::PortraitOrientation;
+    switch (angle) {
+        case 0:
+            orientation = Qt::LandscapeOrientation; break;
+        case 90:
+            orientation = Qt::InvertedPortraitOrientation; break;
+        case 180:
+            orientation = Qt::InvertedLandscapeOrientation; break;
+        case 270:
+        default:
+            orientation = Qt::PortraitOrientation; break;
+    }
+
+    d->setLayoutOrientation(orientation);
 }
 
 bool InputMethod::imExtensionEvent(MImExtensionEvent *event)
@@ -738,7 +740,9 @@
     d->layout.helper.setScreenSize(size);
     d->extended_layout.helper.setScreenSize(d->layout.helper.screenSize());
 
+#ifdef TEMP_DISABLED
     d->updateKeyboardOrientation();
+#endif
 }
 
 void InputMethod::onStyleSettingChanged()
@@ -927,5 +931,20 @@
     return d->predictionEnabled;
 }
 
+void InputMethod::onQQuickViewStatusChanged(QQuickView::Status status)
+{
+    Q_D(InputMethod);
+
+    switch (status) {
+    case QQuickView::Ready:
+    {
+        d->qmlRootItem = qobject_cast<QQuickItem*> (d->view->rootObject());
+        QObject::connect(d->qmlRootItem, SIGNAL(hideAnimationFinishedChanged()), this, SLOT(onHideAnimationFinished()));
+    }
+        break;
+    default:
+        break;
+    }
+}
 
 } // namespace MaliitKeyboard

=== modified file 'maliit-keyboard/plugin/inputmethod.h'
--- maliit-keyboard/plugin/inputmethod.h	2013-07-29 11:52:26 +0000
+++ maliit-keyboard/plugin/inputmethod.h	2013-07-30 16:18:26 +0000
@@ -35,7 +35,9 @@
 #include <maliit/plugins/abstractinputmethod.h>
 #include <maliit/plugins/abstractinputmethodhost.h>
 #include <maliit/plugins/keyoverride.h>
+
 #include <QtGui>
+#include <QtQuick/QQuickView>
 
 namespace MaliitKeyboard {
 
@@ -75,6 +77,7 @@
     Q_SLOT void deviceOrientationChanged(Qt::ScreenOrientation orientation);
 
     Q_SLOT void updateWordEngine();
+    Q_SLOT void onQQuickViewStatusChanged(QQuickView::Status status);
 
     Q_PROPERTY(bool predictionEnabled READ predictionEnabled NOTIFY predictionEnabledChanged)
 

=== modified file 'maliit-keyboard/qml/Keyboard.qml'
--- maliit-keyboard/qml/Keyboard.qml	2013-07-16 16:22:34 +0000
+++ maliit-keyboard/qml/Keyboard.qml	2013-07-30 16:18:26 +0000
@@ -40,6 +40,8 @@
 
     visible: layout.visible
 
+    property int contentOrientation: Qt.PrimaryOrientation
+
     property bool shown: false;
     property bool wordribbon_visible: true;
 

=== modified file 'maliit-keyboard/qml/RotationHelper.qml'
--- maliit-keyboard/qml/RotationHelper.qml	2013-05-16 17:32:04 +0000
+++ maliit-keyboard/qml/RotationHelper.qml	2013-07-30 16:18:26 +0000
@@ -18,11 +18,11 @@
 import QtQuick.Window 2.0
 
 Item {
-    id: orientationHelper
-
-    property string __rotationString: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation).toString();
-
-    rotation: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation);
+    id: rotationHelper
+
+    property string __rotationString: Screen.angleBetween(Screen.primaryOrientation, contentOrientation).toString();
+
+    rotation: Screen.angleBetween(Screen.primaryOrientation, contentOrientation);
 
     anchors.fill: parent
 
@@ -33,7 +33,7 @@
             State {
                 name: "270"
                 PropertyChanges {
-                    target: orientationHelper
+                    target: rotationHelper
                     anchors {
                         leftMargin: (parent.width - parent.height) / 2
                         rightMargin: anchors.leftMargin
@@ -45,7 +45,7 @@
             State {
                 name: "90"
                 PropertyChanges {
-                    target: orientationHelper
+                    target: rotationHelper
                     anchors {
                         leftMargin: (parent.width - parent.height) / 2
                         rightMargin: anchors.leftMargin