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

[Cris Dywan]

Make automaticOrientation on MainView a no-op

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2070/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/798
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/800
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/800/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/797

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2070/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2079/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/809
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/806

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2079/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

What is the reason for keeping OrientationHelper inside the MainView?

review: Needs Information

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

1585. By Cris Dywan on 2015-08-07

Remove OrientationHelper from MainView 1.3

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1585
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2105/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/835
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/832

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2105/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

What if we only touch 1.3? I am a bit afraid the 1.2 changes will hurt us. Let's keep the 1.2 intact and work on 1.3 only.

review: Needs Information

[Tim Peeters (tpeeters)]

43 + anchors.fill: parent
44 + anchors.bottomMargin: mainView.anchorToKeyboard &&

Please group these properties.

[Cris Dywan (kalikiana)]

Note the bug report. Using OrientationHelper causes bugs when it is active together with shell rotation.

[Cris Dywan (kalikiana)]

Thank you Launchpad. Now trying again by hand:

> What if we only touch 1.3?
> I am a bit afraid the 1.2 changes will hurt us.
> Let's keep the 1.2 intact and work on 1.3 only.

Note the bug report. Using OrientationHelper causes bugs when it is active together with shell rotation.

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

1586. By Cris Dywan on 2015-08-10

Group fill and bottomMargin under anchors

[Zsombor Egri (zsombi)]

Good to go from my side.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1586
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/837
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/834

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2107/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Ok, top-approved!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/1.2/MainView.qml'
--- src/Ubuntu/Components/1.2/MainView.qml	2015-04-30 09:27:00 +0000
+++ src/Ubuntu/Components/1.2/MainView.qml	2015-08-10 15:35:34 +0000
@@ -26,7 +26,7 @@
     /*!
       \qmlproperty bool automaticOrientation
      */
-    property alias automaticOrientation: canvas.automaticOrientation
+    property bool automaticOrientation: false
     property bool useDeprecatedToolbar: true
 
     /*!

=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2015-07-23 10:13:48 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2015-08-10 15:35:34 +0000
@@ -98,24 +98,28 @@
 
     /*!
       \qmlproperty bool MainView::automaticOrientation
+      \deprecated
 
       Sets whether the application will be automatically rotating when the
       device is.
 
-      The default value is false.
+      This property has no significance anymore as the shell rotates.
     */
-    property alias automaticOrientation: canvas.automaticOrientation
+    property bool automaticOrientation: false
 
     /*!
       \internal
       Use default property to ensure children added do not draw over the header.
      */
     default property alias contentsItem: contents.data
-    OrientationHelper {
+    Item {
         id: canvas
-
-        automaticOrientation: false
-        anchorToKeyboard: mainView.anchorToKeyboard
+        anchors {
+            fill: parent
+            bottomMargin: mainView.anchorToKeyboard &&
+                UbuntuApplication.inputMethod.visible ?
+                    UbuntuApplication.inputMethod.keyboardRectangle.height : 0
+        }
 
         // clip the contents so that it does not overlap the header
         Item {