Merge lp:~mzanetti/unity8/virtual-touchpad-visual-updates into lp:unity8

[Michael Zanetti]

Some visual updates and rotation lock for the virtual touchpad

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

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

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

yes, Paty

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2173
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/265/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2173
http://jenkins.qa.ubuntu.com/job/unity8-ci/7207/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6313
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/622/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4851
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6324
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27274
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/331/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/620
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27273

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

+ wait(0); // Spin event loop to be sure to update bindings etc
+ compare(content.rotation, oldRotation);

Why not a tryCompare?

review: Needs Information

[Albert Astals Cid (aacid)]

+ // For testing
+ property var screen: Screen
+ property var orientationLock: OrientationLock

I can't find these used on the tests, what am i missing?

review: Needs Information

[Michael Zanetti (mzanetti)]

> + wait(0); // Spin event loop to be sure to update bindings etc
> + compare(content.rotation, oldRotation);
>
> Why not a tryCompare?

Because I want to make sure it does *not* change.

[Albert Astals Cid (aacid)]

Ah, right, what we have in a few places is something like
expectFail()
tryCompareFunction(function( { return content.rotation != oldRotation; }, true, SomeTimeout);

it's a bit more reliable than "hoping" wait(0) will always update the bindings in the future, what do you think?

[lp:~mzanetti/unity8/virtual-touchpad-visual-updates]

2174. By Michael Zanetti on 2016-02-12

use expectFail to make test more robust

[Michael Zanetti (mzanetti)]

> Ah, right, what we have in a few places is something like
> expectFail()
> tryCompareFunction(function( { return content.rotation != oldRotation; },
> true, SomeTimeout);
>
> it's a bit more reliable than "hoping" wait(0) will always update the bindings
> in the future, what do you think?

done. thanks

[Michael Zanetti (mzanetti)]

> + // For testing
> + property var screen: Screen
> + property var orientationLock: OrientationLock
>
> I can't find these used on the tests, what am i missing?

Line 141 - 157 in the diff, I suppose.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2174
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/336/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/459/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/482
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/500
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/500
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/496
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/496/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/496/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/496
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/496/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/496/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/496
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/496/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/496/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2174
http://jenkins.qa.ubuntu.com/job/unity8-ci/7273/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6444
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/688/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/681
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/679
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6455
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27537
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/355/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/686
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27536

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Yes

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[lp:~mzanetti/unity8/virtual-touchpad-visual-updates]

2175. By Michael Zanetti on 2016-02-18

merge trunk

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2175
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/514/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/678
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/256
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/256
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/258
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/701
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/719
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/719
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/715/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/715
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/715/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'qml/DisabledScreenNotice.qml'
--- qml/DisabledScreenNotice.qml	2016-01-26 15:29:54 +0000
+++ qml/DisabledScreenNotice.qml	2016-02-18 16:38:27 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
+import Unity.Session 0.1
 import QtQuick.Window 2.2
 import "Components"
 
@@ -25,19 +26,36 @@
 
     property bool infoNoteDisplayed: true
 
-    WallpaperResolver {
-        width: root.width
-        id: wallpaperResolver
+    // For testing
+    property var screen: Screen
+    property var orientationLock: OrientationLock
+
+    DeviceConfiguration {
+        id: deviceConfiguration
+        name: applicationArguments.deviceName
     }
 
     Item {
         id: contentContainer
+        objectName: "contentContainer"
         anchors.centerIn: parent
         height: rotation == 90 || rotation == 270 ? parent.width : parent.height
         width: rotation == 90 || rotation == 270 ? parent.height : parent.width
 
+        property int savedOrientation: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
+                                       ? (root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation)
+                                       : deviceConfiguration.primaryOrientation
+
         rotation: {
-            switch (Screen.orientation) {
+            var usedOrientation = root.screen.orientation;
+
+            if (root.orientationLock.enabled) {
+                usedOrientation = savedOrientation;
+            }
+
+            savedOrientation = usedOrientation;
+
+            switch (usedOrientation) {
             case Qt.PortraitOrientation:
                 return 0;
             case Qt.LandscapeOrientation:
@@ -47,6 +65,8 @@
             case Qt.InvertedLandscapeOrientation:
                 return 90;
             }
+
+            return 0;
         }
         transformOrigin: Item.Center
 
@@ -60,9 +80,9 @@
             }
         }
 
-        Image {
+        Rectangle {
             anchors.fill: parent
-            source: wallpaperResolver.background
+            color: "#3b3b3b"
         }
 
         Item {
@@ -74,22 +94,26 @@
                 UbuntuNumberAnimation { }
             }
 
-            Rectangle {
-                anchors.fill: parent
-                color: "black"
-                opacity: 0.4
-            }
-
-            Label {
-                id: text
+            Column {
                 anchors.centerIn: parent
                 width: parent.width - units.gu(8)
-                text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the mouse.")
-                color: "white"
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                fontSize: "x-large"
-                wrapMode: Text.Wrap
+                spacing: units.gu(4)
+
+                Label {
+                    id: text
+                    text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.")
+                    color: "white"
+                    width: parent.width
+                    fontSize: "large"
+                    wrapMode: Text.Wrap
+                }
+                Icon {
+                    height: units.gu(8)
+                    width: height
+                    name: "input-touchpad-symbolic"
+                    color: "white"
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
             }
         }
 

=== modified file 'tests/qmltests/tst_DisabledScreenNotice.qml'
--- tests/qmltests/tst_DisabledScreenNotice.qml	2016-01-21 22:03:42 +0000
+++ tests/qmltests/tst_DisabledScreenNotice.qml	2016-02-18 16:38:27 +0000
@@ -15,18 +15,62 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import "../../qml"
 
 Item {
     id: root
-    width: units.gu(40)
+    width: units.gu(80)
     height: units.gu(70)
 
     DisabledScreenNotice {
         id: touchScreenPad
         anchors.fill: parent
+        anchors.rightMargin: units.gu(40)
+
+        screen: QtObject {
+            property int orientation: {
+                switch (orientationSelector.selectedIndex) {
+                case 0:
+                    return Qt.PortraitOrientation;
+                case 1:
+                    return Qt.LandscapeOrientation;
+                case 2:
+                    return Qt.InvertedPortraitOrientation;
+                case 3:
+                    return Qt.InvertedLandscapeOrientation;
+                }
+            }
+        }
+        orientationLock: QtObject {
+            property bool enabled: orientationLockCheckBox.checked
+        }
+    }
+
+    Column {
+        anchors.fill: parent
+        anchors.leftMargin: units.gu(40)
+
+        ItemSelector {
+            id: orientationSelector
+            model: ["Portrait", "Landscape", "InvertedPortrait", "InvertedLandscape"]
+            selectedIndex: 0
+        }
+
+        RowLayout {
+            CheckBox {
+                id: orientationLockCheckBox
+                checked: false
+            }
+            Label {
+                text: "Rotation lock"
+                Layout.fillWidth: true
+            }
+        }
     }
 
     UnityTestCase {
@@ -36,10 +80,40 @@
 
         function test_mouseAreaHidesOnFirstTap() {
             var noticeArea = findChild(touchScreenPad, "infoNoticeArea")
-            print("noticeArea", noticeArea.visible)
             compare(noticeArea.visible, true)
             tap(root)
             tryCompare(noticeArea, "visible", false)
         }
+
+        function test_rotation_data() {
+            return [
+                {tag: "portrait", selectedOrientation: 0, expectedAngle: 0},
+                {tag: "landscape", selectedOrientation: 1, expectedAngle: 270},
+                {tag: "invertedportrait", selectedOrientation: 2, expectedAngle: 180},
+                {tag: "invertetlandscape", selectedOrientation: 3, expectedAngle: 90}
+            ];
+        }
+
+        function test_rotation(data) {
+            var content = findChild(touchScreenPad, "contentContainer");
+
+            var oldRotation = content.rotation;
+
+            // Turn on orientation lock
+            orientationLockCheckBox.checked = true;
+
+            // simulate the rotation
+            orientationSelector.selectedIndex = data.selectedOrientation;
+
+            // Make sure it is still in the old rotation (as we have the lock turned on)
+            expectFail("", "Rotation lock set. Expecting automatic rotation to fail.");
+            tryCompareFunction(function() { return content.rotation != oldRotation; }, true, 300);
+
+            // Now uncheck the rotation lock
+            orientationLockCheckBox.checked = false;
+
+            // And make sure it catches up to the expected angle
+            tryCompare(content, "rotation", data.expectedAngle);
+        }
     }
 }