Unity 8

Merge lp:~lukas-kde/unity8/no-touchscreen-no-tutorial into lp:unity8

  1. no-touchscreen-no-tutorial
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2809
Merged at revision: 2850
Proposed branch: lp:~lukas-kde/unity8/no-touchscreen-no-tutorial
Merge into: lp:unity8
Prerequisite: lp:~lukas-kde/unity8/osk-indicator-switch
Diff against target: 93 lines (+19/-3)
6 files modified
qml/OrientedShell.qml (+1/-1)
qml/Shell.qml (+3/-2)
tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-0)
tests/qmltests/tst_OrientedShell.qml (+12/-0)
tests/qmltests/tst_Shell.qml (+1/-0)
tests/qmltests/tst_ShellWithPin.qml (+1/-0)
To merge this branch: bzr merge lp:~lukas-kde/unity8/no-touchscreen-no-tutorial
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Unity8 CI Bot continuous-integration Approve
Michael Terry Pending
Review via email: mp+317877@code.launchpad.net

This proposal supersedes a proposal from 2017-02-03.

Commit message

Disable the tutorial when there's no touchscreen

Description of the change

Disable the tutorial when there's no touchscreen

Otherwise it's inescapable and blocks input, fixes lp:1661557

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

Yes, prereq

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

N/A

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

N/A

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote : Posted in a previous version of this proposal

Shouldn't we, instead, make the tutorial work for all available input devices? Maybe even go through it again when we discover a new input device that we didn't yet go through the tutorial for?

review: Needs Information
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote : Posted in a previous version of this proposal

Yeah maybe... but that's a question for design first I assume. This MP is trying unblock the desktop and fix the bug, I didn't really think further.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2804
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3113/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4049
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2373
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2373
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4077
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3918
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3918/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3918
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3918/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3918
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3918/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3918
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3918/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3918
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3918/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3918
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3918/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote : Posted in a previous version of this proposal

We have tests that use the mouse right? Like push to right edge of screen on desktop mode of tutorial.

Revision history for this message
Michał Sawicz (saviq) wrote : Posted in a previous version of this proposal

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

 * Did CI run pass? If not, please explain why.
Not yet, but tested locally

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2805
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3145/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4121
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2417
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2417
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4149
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3989
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3989/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3989
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3989/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3989
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3989/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3989
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3989/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3989
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3989/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3989
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3989/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2806
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3148/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4127
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2418
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2418
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4155
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3995
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3995/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3995
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3995/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3995
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3995/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3995
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3995/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3995
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3995/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3995
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3995/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2807
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3149/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4129/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4157
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3997
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3997/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3997
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3997/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3997
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3997/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3997
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3997/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3997
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3997/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3997/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2807
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3152/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4134
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2424
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2424
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4162
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4002
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4002/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4002
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4002/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4002
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4002/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4002
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4002/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4002
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4002/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4002
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4002/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote : Posted in a previous version of this proposal

Fixed the tests

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2808
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3163/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4152
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2437
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2437
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4180
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4018/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4018
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4018/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2809
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3167/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4156
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2443
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2443
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4184
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4022
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4022/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4022
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4022/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4022
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4022/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4022
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4022/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4022
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4022/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4022
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4022/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
Pete Woods (pete-woods) wrote :

Sorry to nag in here, but it'd also be great if you could at least dismiss this with the escape key. Hitting escape/close is my natural reaction when any tutorial pops up on a desktop, at least, and I might want to do this on a device with a touch screen.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/OrientedShell.qml'
2--- qml/OrientedShell.qml 2017-02-21 16:22:24 +0000
3+++ qml/OrientedShell.qml 2017-02-21 16:22:24 +0000
4@@ -274,7 +274,7 @@
5 mode: applicationArguments.mode
6 hasMouse: pointerInputDevices > 0
7 hasKeyboard: keyboardsModel.count > 0
8-
9+ hasTouchscreen: touchScreensModel.count > 0
10 oskEnabled: unity8Settings.alwaysShowOsk || !hasKeyboard || forceOSKEnabled
11
12 usageScenario: {
13
14=== modified file 'qml/Shell.qml'
15--- qml/Shell.qml 2017-02-21 16:22:24 +0000
16+++ qml/Shell.qml 2017-02-21 16:22:24 +0000
17@@ -69,6 +69,7 @@
18 }
19 property bool hasMouse: false
20 property bool hasKeyboard: false
21+ property bool hasTouchscreen: false
22
23 // to be read from outside
24 readonly property int mainAppWindowOrientationAngle: stage.mainAppWindowOrientationAngle
25@@ -628,8 +629,8 @@
26 objectName: "tutorial"
27 anchors.fill: parent
28
29- paused: callManager.hasCalls || !greeter || greeter.active ||
30- wizard.active
31+ paused: callManager.hasCalls || !greeter || greeter.active || wizard.active
32+ || !hasTouchscreen // TODO #1661557 something better for no touchscreen
33 delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
34 inputMethod.visible ||
35 (launcher.shown && !launcher.lockedVisible) ||
36
37=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
38--- tests/qmltests/Tutorial/tst_Tutorial.qml 2017-02-13 13:46:22 +0000
39+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2017-02-21 16:22:24 +0000
40@@ -149,6 +149,7 @@
41 native_: shellLoader.nativeOrientation
42 primary: shellLoader.primaryOrientation
43 }
44+ hasTouchscreen: true
45
46 Component.onDestruction: {
47 shellLoader.itemDestroyed = true;
48
49=== modified file 'tests/qmltests/tst_OrientedShell.qml'
50--- tests/qmltests/tst_OrientedShell.qml 2017-02-21 16:22:24 +0000
51+++ tests/qmltests/tst_OrientedShell.qml 2017-02-21 16:22:24 +0000
52@@ -1639,5 +1639,17 @@
53 tryCompare(dialogLoader, "item", null);
54 compare(window.activeFocusItem, surfaceItem);
55 }
56+
57+ function test_tutorialDisabledWithNoTouchscreen() {
58+ loadShell("desktop");
59+ usageModeSelector.selectWindowed();
60+
61+ MockInputDeviceBackend.addMockDevice("/touchscreen", InputInfo.TouchScreen);
62+ var tutorial = findChild(shell, "tutorial");
63+ tryCompare(tutorial, "paused", false);
64+
65+ MockInputDeviceBackend.removeDevice("/touchscreen");
66+ tryCompare(tutorial, "paused", true);
67+ }
68 }
69 }
70
71=== modified file 'tests/qmltests/tst_Shell.qml'
72--- tests/qmltests/tst_Shell.qml 2017-02-16 13:46:11 +0000
73+++ tests/qmltests/tst_Shell.qml 2017-02-21 16:22:24 +0000
74@@ -137,6 +137,7 @@
75 primary: shellLoader.primaryOrientation
76 }
77 mode: shellLoader.mode
78+ hasTouchscreen: true
79 Component.onCompleted: {
80 ApplicationManager.startApplication("unity8-dash");
81 }
82
83=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
84--- tests/qmltests/tst_ShellWithPin.qml 2017-01-24 07:42:24 +0000
85+++ tests/qmltests/tst_ShellWithPin.qml 2017-02-21 16:22:24 +0000
86@@ -69,6 +69,7 @@
87 property bool itemDestroyed: false
88 sourceComponent: Component {
89 Shell {
90+ hasTouchscreen: true
91 Component.onDestruction: {
92 shellLoader.itemDestroyed = true
93 }

Subscribers

People subscribed via source and target branches