Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/orientationManual into lp:ubuntu-ui-toolkit/staging

[Christian Dywan]

Allow manual orientation changes through OrientationHelper.orientation

Autopilot tests for orientation issues in both text input and popovers/ dialogs:
env APP_ID=uitl LANGUAGE=en ./run_tests.sh ubuntuuitoolkit.tests.components.test_textinput.InsertModeTextInputTestCase.test_rotate_portrait -v
env APP_ID=uitl LANGUAGE=en ./run_tests.sh ubuntuuitoolkit.tests.components.test_popover.PopoverOpenTestCase.test_popover_rotate_portrait -v

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/orientationManual]

1167. By Launchpad Translations on behalf of ubuntu-sdk-team on 2015-03-14

Launchpad automatic translations update.

1168. By Timo Jyrinki on 2015-03-18

No-change rebuild against Qt 5.4.1.

1169. By Florian Boucault on 2015-03-18

Bugfixes for the fresh 1.2 UITK

1170. By CI Train Bot Account on 2015-03-18

Releasing 1.2.1450+15.04.20150318-0ubuntu1

1171. By Launchpad Translations on behalf of ubuntu-sdk-team on 2015-03-22

Launchpad automatic translations update.

1172. By Leo Arias on 2015-03-27

The very last bugfix landing for Vivid

1173. By CI Train Bot Account on 2015-03-27

Releasing 1.2.1458+15.04.20150327-0ubuntu1

1174. By Launchpad Translations on behalf of ubuntu-sdk-team on 2015-03-29

Launchpad automatic translations update.

1175. By Daniel d'Andrada on 2015-03-30

merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/orientationManual

1176. By Daniel d'Andrada on 2015-03-30

fix code and improve fake orientation logic

1177. By Christian Dywan on 2015-04-02

Add automaticOrientation to textinput AP tests and check rotation instead of rotationAngle

1178. By Christian Dywan on 2015-04-02

Fix erroneous changes from branch merge

1179. By Christian Dywan on 2015-04-02

Set rotation on PopupBase directly with no transition

1180. By Christian Dywan on 2015-04-02

Fix components.api

1181. By Christian Dywan on 2015-04-02

Revise AP tests for consistency and comments for clarity

1182. By Christian Dywan on 2015-04-02

Wait for OrientationHelper to finnish animating

1183. By Christian Dywan on 2015-04-02

Verify that orientation really was changed

1184. By Christian Dywan on 2015-04-13

Split up orientation test functions and use lower case

1185. By Christian Dywan on 2015-04-13

Split up orientation test functions and use lower case

1186. By Christian Dywan on 2015-04-13

Use parent OrientationHelper as fakeCursor parent

1187. By Christian Dywan on 2015-04-13

Use objectName to select OrientationHelper in MainView CPO

1188. By Christian Dywan on 2015-04-13

Correctly use hasOwnProperty to check for automaticOrientation

1189. By Christian Dywan on 2015-04-13

Wait on internal flipDimensions after rotation

1190. By Christian Dywan on 2015-04-13

Drop now redundant wait on rotating

1191. By Christian Dywan on 2015-04-13

Fix nonsensical typo fix so it says FOLLOW_SCREEN_ORIENTATION as intended

1192. By Christian Dywan on 2015-04-14

Add license header to test_main_view.orientation.qml

1193. By Christian Dywan on 2015-04-15

Only test non-default orientation for clear results

Otherwise some properties may not change if nothing did rotate.

1194. By Christian Dywan on 2015-04-17

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1195. By Christian Dywan on 2015-04-20

Take Component-based popover rootItem from the caller

1196. By Christian Dywan on 2015-04-20

FakeCursor parent should fallback to toplevel

1197. By Christian Dywan on 2015-04-20

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1198. By Christian Dywan on 2015-04-20

Put back accidentally removed "import os"

1199. By Christian Dywan on 2015-05-12

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1200. By Christian Dywan on 2015-05-13

Empty commit

1201. By Christian Dywan on 2015-05-21

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1202. By Christian Dywan on 2015-05-21

Update components.api

1203. By Christian Dywan on 2015-05-21

Undo accidental changes

1204. By Christian Dywan on 2015-05-21

Move all orientation tests to 1.3

1205. By Christian Dywan on 2015-05-22

Revert bogus components.api changes

1206. By Christian Dywan on 2015-06-01

Normalize rotation angle in tests

1207. By Christian Dywan on 2015-06-02

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1208. By Christian Dywan on 2015-06-02

Use Popups 1.3 in test_popover.qml

1209. By Christian Dywan on 2015-06-02

Assert focus after tapping TextField in popover tests

1210. By Christian Dywan on 2015-06-03

Anchor Column in test_textinput.textfield.qml to the top

1211. By Christian Dywan on 2015-06-05

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1212. By Christian Dywan on 2015-06-10

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1213. By Christian Dywan on 2015-06-11

Use Eventually and wait_ instead of time.sleep

1214. By Christian Dywan on 2015-06-11

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1215. By Christian Dywan on 2015-06-12

Make flake8 happy once again

1216. By Christian Dywan on 2015-06-18

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

Unmerged revisions

1216. By Christian Dywan on 2015-06-18

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1215. By Christian Dywan on 2015-06-12

Make flake8 happy once again

1214. By Christian Dywan on 2015-06-11

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1213. By Christian Dywan on 2015-06-11

Use Eventually and wait_ instead of time.sleep

1212. By Christian Dywan on 2015-06-10

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1211. By Christian Dywan on 2015-06-05

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

1210. By Christian Dywan on 2015-06-03

Anchor Column in test_textinput.textfield.qml to the top

1209. By Christian Dywan on 2015-06-02

Assert focus after tapping TextField in popover tests

1208. By Christian Dywan on 2015-06-02

Use Popups 1.3 in test_popover.qml

1207. By Christian Dywan on 2015-06-02

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

=== modified file 'examples/ubuntu-ui-toolkit-gallery/po/es.po'
--- examples/ubuntu-ui-toolkit-gallery/po/es.po	2015-03-14 05:29:12 +0000
+++ examples/ubuntu-ui-toolkit-gallery/po/es.po	2015-03-31 12:57:21 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-ui-toolkit\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-11-11 11:21+0100\n"
-"PO-Revision-Date: 2015-01-16 03:32+0000\n"
+"PO-Revision-Date: 2015-03-28 06:18+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-14 05:29+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
+"X-Launchpad-Export-Date: 2015-03-29 05:42+0000\n"
+"X-Generator: Launchpad (build 17413)\n"
 
 #: Animations.qml:24
 msgid "NumberAnimation"
@@ -349,7 +349,7 @@
 
 #: Styles.qml:40
 msgid "Switch between themes"
-msgstr ""
+msgstr "Cambiar de tema"
 
 #: TextInputs.qml:49
 msgid "Type me in..."
@@ -401,12 +401,12 @@
 
 #: UbuntuShape.qml:49
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #: UbuntuShape.qml:64
 msgid "Radius"
-msgstr ""
+msgstr "Radio"
 
 #: UbuntuShape.qml:97
 msgid "Sizes"
-msgstr ""
+msgstr "Tamaños"

=== modified file 'modules/Ubuntu/Components/MainViewBase.qml'
--- modules/Ubuntu/Components/MainViewBase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/MainViewBase.qml	2015-03-31 12:57:21 +0000
@@ -56,6 +56,20 @@
                 Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
             }
         }
+
+        // Functions to allow Autopilot to handle orientation
+        objectName: "MainViewBaseStyledItem"
+        function setOrientation(newOrientation) {
+            if (newOrientation == 'Landscape')
+                UbuntuApplication.orientation = Qt.LandscapeOrientation
+            else if (newOrientation == 'Portrait')
+                UbuntuApplication.orientation = Qt.PortraitOrientation
+            else
+                UbuntuApplication.orientation = newOrientation
+        }
+        function getOrientation() {
+            return UbuntuApplication.orientation
+        }
     }
 
     active: true

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2015-03-06 07:55:23 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-03-31 12:57:21 +0000
@@ -83,11 +83,14 @@
 
       Calculates the current orientation angle.
      */
-    property int orientationAngle: automaticOrientation ? Screen.angleBetween(Screen.primaryOrientation, Screen.orientation) : 0
+    readonly property int orientationAngle: automaticOrientation
+        ? Screen.angleBetween(Screen.primaryOrientation, UbuntuApplication.orientation)
+        : 0
     // Screen.primaryOrientation and Screen.orientation can change one right after the other,
     // causing orientationAngle to momentarily change. To avoid responding to such
     // intermediate states, wait for its value to stabilize before rotating to it.
-    onOrientationAngleChanged: { automaticOrientation ? stableOrientationAngleTimer.restart() : d.tryUpdateState(); }
+    onOrientationAngleChanged: automaticOrientation ? stableOrientationAngleTimer.restart()
+                                                    : d.tryUpdateState();
 
     /*!
       The property holds if the OrientationHelper should automatically resize the
@@ -102,13 +105,6 @@
     width: parent ? (d.flipDimensions ? d.availableParentHeight : parent.width) : 0
     height: parent ? (d.flipDimensions ? parent.width : d.availableParentHeight) : 0
 
-    /*
-      The attached property Screen.orientation is only valid inside Item or
-      derived components. Inside Object it evaluates to 0 with no error.
-      Also be aware that some apps eg. webbrowser-app set window.contentOrientation
-      and thus can hide failure to update it from this code.
-      See http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick-window2-screen.html
-    */
     Item {
         id: d
 
@@ -138,7 +134,7 @@
          */
         function applyOrientation() {
             if (windowActive && window)
-                window.contentOrientation = Screen.orientation
+                window.contentOrientation = UbuntuApplication.orientation
         }
 
         onWindowActiveChanged: {

=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2015-03-31 12:57:21 +0000
@@ -47,11 +47,6 @@
       */
     property PropertyAnimation fadingAnimation: PropertyAnimation{duration: 0}
 
-    // without specifying width and height below, some width calculations go wrong in Sheet.
-    // I guess popupBase.width is not correctly set initially
-    width: parent ? parent.width : undefined
-    height: parent ? parent.height : undefined
-
     // copy value of automaticOrientation from root object (typically a MainView)
     automaticOrientation: stateWrapper.rootItem && stateWrapper.rootItem.automaticOrientation ?
                           stateWrapper.rootItem.automaticOrientation : false

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2015-03-18 15:51:07 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-03-31 12:57:21 +0000
@@ -293,7 +293,12 @@
     Item {
         id: fakeCursor
         objectName: positionProperty + "FakeCursor"
-        parent: QuickUtils.rootItem(handler.main)
+        // Parent to the contentsItem to be able to inherit rotation
+        parent: {
+            var mainView = QuickUtils.rootItem(handler.main);
+            // Check in case the root isn't a MainView
+            return mainView.contentsItem ? mainView.contentsItem[0] : mainView;
+        }
         width: cursorItem.width
         height: cursorItem.height
         Component.onCompleted: caret.parent = fakeCursor

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-04 19:07:58 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-31 12:57:21 +0000
@@ -244,12 +244,5 @@
     // register icon provider
     engine->addImageProvider(QLatin1String("theme"), new UnityThemeIconProvider);
 
-    // Necessary for Screen.orientation (from import QtQuick.Window 2.0) to work
-    QGuiApplication::primaryScreen()->setOrientationUpdateMask(
-            Qt::PortraitOrientation |
-            Qt::LandscapeOrientation |
-            Qt::InvertedPortraitOrientation |
-            Qt::InvertedLandscapeOrientation);
-
     registerWindowContextProperty();
 }

=== modified file 'modules/Ubuntu/Components/plugin/ucapplication.cpp'
--- modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-10-02 10:14:51 +0000
+++ modules/Ubuntu/Components/plugin/ucapplication.cpp	2015-03-31 12:57:21 +0000
@@ -19,10 +19,13 @@
 #include "ucapplication.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtGui/QGuiApplication>
+#include <QWindow>
 #include <QDebug>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
 #include <QtCore/QStandardPaths>
+#include <QScreen>
 
 /*!
  * \qmltype UbuntuApplication
@@ -33,11 +36,20 @@
  *
  * UbuntuApplication is a context property in QML.
  */
-UCApplication::UCApplication(QObject* parent) : QObject(parent), m_context(0)
+UCApplication::UCApplication(QObject* parent) : QObject(parent), m_context(0), m_orientation(-1)
 {
     // Make sure we receive application name changes from C++ modules
     connect(QCoreApplication::instance(), &QCoreApplication::applicationNameChanged,
             this, &UCApplication::applicationNameChanged);
+
+    // Follow primary screen orientation changes
+    QGuiApplication::primaryScreen()->setOrientationUpdateMask(
+            Qt::PortraitOrientation |
+            Qt::LandscapeOrientation |
+            Qt::InvertedPortraitOrientation |
+            Qt::InvertedLandscapeOrientation);
+    connect(QGuiApplication::primaryScreen(), &QScreen::orientationChanged,
+            this, &UCApplication::orientationChanged);
 }
 
 void UCApplication::setContext(QQmlContext* context) {
@@ -73,3 +85,29 @@
     QCoreApplication::setOrganizationDomain(applicationName);
 }
 
+/*!
+ * \qmlproperty Qt.ScreenOrientation Application::orientation
+ * \internal
+ * The current orientation of the application - can be overridden manually for testing.
+ */
+Qt::ScreenOrientation UCApplication::orientation() {
+    if (m_orientation == -1) {
+        return QGuiApplication::primaryScreen()->orientation();
+    } else {
+        return static_cast<Qt::ScreenOrientation>(m_orientation);
+    }
+}
+
+void UCApplication::setOrientation(Qt::ScreenOrientation orientation) {
+    if (m_orientation == -1) {
+        // we're now in manual override mode
+        disconnect(QGuiApplication::primaryScreen(), &QScreen::orientationChanged,
+                this, &UCApplication::orientationChanged);
+    }
+
+    if (m_orientation != orientation) {
+        m_orientation = orientation;
+        Q_EMIT orientationChanged(orientation);
+    }
+}
+

=== modified file 'modules/Ubuntu/Components/plugin/ucapplication.h'
--- modules/Ubuntu/Components/plugin/ucapplication.h	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucapplication.h	2015-03-31 12:57:21 +0000
@@ -28,6 +28,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(QString applicationName READ applicationName WRITE setApplicationName NOTIFY applicationNameChanged)
+    Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
 
 private:
     Q_DISABLE_COPY(UCApplication)
@@ -42,16 +43,20 @@
 
     // getter
     QString applicationName();
+    Qt::ScreenOrientation orientation();
 
     // setter
     void setContext(QQmlContext* context);
     void setApplicationName(const QString& applicationName);
+    void setOrientation(Qt::ScreenOrientation orientation);
 
 private:
     QQmlContext* m_context;
+    int m_orientation;
 
 Q_SIGNALS:
     void applicationNameChanged();
+    void orientationChanged(Qt::ScreenOrientation orientation);
 };
 
 #endif // UBUNTU_COMPONENTS_I18N_H

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2015-02-11 23:37:40 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2015-03-31 12:57:21 +0000
@@ -17,6 +17,7 @@
 """Ubuntu UI Toolkit Autopilot custom proxy objects."""
 
 import logging
+import time
 
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
@@ -56,6 +57,18 @@
 
         return False
 
+    def _set_orientation(self, orientation):
+        self.select_single(
+            objectName='MainViewBaseStyledItem').slots.setOrientation(
+                orientation)
+        # Short delay to ensure introspection is uptodate
+        time.sleep(1)
+
+    @property
+    def _orientation(self):
+        return self.select_single(
+            objectName='MainViewBaseStyledItem').orientation
+
     def get_header(self):
         """Return the AppHeader custom proxy object of the MainView."""
         try:

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2014-10-06 10:44:31 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2015-03-31 12:57:21 +0000
@@ -17,10 +17,44 @@
 """Tests for the Ubuntu UI Toolkit Header component."""
 
 import os
+import time
 
 from ubuntuuitoolkit import tests
 
 
+class PopoverOpenTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_popover.qml')
+
+    scenarios = [
+        ('Popover', dict(button='button', popover='popover')),
+        ('Small dialog', dict(button='button_small', popover='dialog_small')),
+        ('Huge dialog', dict(button='button_huge', popover='dialog_huge')),
+    ]
+
+    def setUp(self):
+        super(PopoverOpenTestCase, self).setUp()
+
+    def _rotate(self, orientation):
+        self.main_view._set_orientation(orientation)
+        button = self.main_view.select_single(objectName=self.button)
+        self.pointing_device.click_object(button)
+        # Give rendering a chance to finish
+        time.sleep(2)
+        popover = self.main_view.select_single(objectName=self.popover)
+        self.assertEqual(popover.rotationAngle, self.main_view.select_single(
+            'OrientationHelper').rotation)
+
+    def test_popover_rotate_landscape(self):
+        self._rotate('Landscape')
+
+    def test_popover_rotate_portrait(self):
+        self._rotate('Portrait')
+
+
 class DialogScrollTestCase(tests.QMLFileAppTestCase):
 
     path = os.path.abspath(__file__)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml	2015-03-31 12:57:21 +0000
@@ -15,19 +15,28 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
+import Ubuntu.Test 1.0
 
 MainView {
-    width: units.gu(48)
-    height: units.gu(60)
+    id: root
+    width: units.gu(60)
+    height: units.gu(40)
     objectName: "mainView"
 
+    automaticOrientation: true
+
     Page {
         title: "Popover"
 
         Column {
             Button {
+                objectName: "button"
+                text: "Pop over"
+                onClicked: PopupUtils.open(popoverComponent)
+            }
+            Button {
                 objectName: "button_small"
                 text: "Small"
                 onClicked: PopupUtils.open(smallDialogComponent)
@@ -37,15 +46,54 @@
                 text: "Huge"
                 onClicked: PopupUtils.open(hugeDialogComponent)
             }
+            Button {
+                text: "Landscape"
+                onClicked: UbuntuApplication.orientation = Qt.LandscapeOrientation;
+            }
+            Button {
+                text: "Portrait"
+                onClicked: UbuntuApplication.orientation = Qt.PortraitOrientation;
+            }
+        }
+
+        Component {
+            id: popoverComponent
+            Popover {
+                objectName: "popover"
+                Column {
+                    Button {
+                        text: "Just a button"
+                        onClicked: {
+                            if (UbuntuApplication.orientation === Qt.LandscapeOrientation) {
+                                UbuntuApplication.orientation = Qt.PortraitOrientation;
+                            } else {
+                                UbuntuApplication.orientation = Qt.LandscapeOrientation
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         Component {
             id: smallDialogComponent
             Dialog {
+                id: smallDialog
                 objectName: "dialog_small"
-                Column {
+                Row {
                     Button {
                         text: "Just a button"
+                        onClicked: {
+                            if (UbuntuApplication.orientation === Qt.LandscapeOrientation) {
+                                UbuntuApplication.orientation = Qt.PortraitOrientation;
+                            } else {
+                                UbuntuApplication.orientation = Qt.LandscapeOrientation
+                            }
+                        }
+                    }
+                    Button {
+                        text: "close"
+                        onClicked: PopupUtils.close(smallDialog)
                     }
                 }
             }

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-03-16 10:01:09 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-03-31 12:57:21 +0000
@@ -166,6 +166,26 @@
         self.assertTrue(popover.globalRect.y > 0,
                         '%s <= 0' % popover.globalRect.y)
 
+    def _rotate(self, orientation):
+        if self.test_qml_file_path != self.textfield_qml_file_path:
+            self.skipTest('FIXME: Header behavior breaks some rotation cases')
+        self.main_view._set_orientation(orientation)
+        self.pointing_device.click_object(self.textfield)
+        cursor = self.select_cursor('cursorPosition')
+        self.pointing_device.click_object(cursor)
+        # Give rendering a chance to finish
+        sleep(2)
+        popover = self.main_view.get_text_input_context_menu(
+            'text_input_contextmenu')
+        self.assertEqual(popover.rotation, self.main_view.select_single(
+            'OrientationHelper').rotation)
+
+    def test_rotate_landscape(self):
+        self._rotate('Landscape')
+
+    def test_rotate_portrait(self):
+        self._rotate('Portrait')
+
     def test_header_undisturbed_by_text_handlers(self):
         # Verify that handlers aren't accidentally placed at absolute 0/0
         self.pointing_device.click_object(self.textfield)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textarea.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textarea.qml	2015-03-10 16:29:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textarea.qml	2015-03-31 12:57:21 +0000
@@ -22,6 +22,8 @@
     height: units.gu(60)
     objectName: "mainView"
 
+    automaticOrientation: true
+
     Page {
         title: "Textarea"
         head.backAction: Action {

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield.qml	2015-03-10 16:29:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield.qml	2015-03-31 12:57:21 +0000
@@ -18,10 +18,12 @@
 import Ubuntu.Components 1.2
 
 MainView {
-    width: units.gu(48)
-    height: units.gu(60)
+    width: units.gu(60)
+    height: units.gu(40)
     objectName: "mainView"
 
+    automaticOrientation: true
+
     Page {
         title: "Textfield"
         head.backAction: Action {
@@ -31,11 +33,17 @@
         }
 
         Column {
+            anchors.bottom: parent.bottom
+            spacing: units.gu(2)
+
             TextField {
                 objectName: "textfield"
                 placeholderText: "Type here"
                 width: units.gu(35)
             }
+            Label {
+                text: i18n.tr("Text fields are awesome")
+            }
         }
     }
 }

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield_custom.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield_custom.qml	2015-03-10 16:29:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield_custom.qml	2015-03-31 12:57:21 +0000
@@ -23,6 +23,8 @@
     height: units.gu(60)
     objectName: "mainView"
 
+    automaticOrientation: true
+
     Page {
         title: "Textfield"
         head.backAction: Action {