Merge lp:~mzanetti/unity8/detect-touchpads into lp:unity8

[Michael Zanetti]

detect touchpads too, not only mice

Also I left this comment on the upstream api: https://codereview.qt-project.org/#/c/101049/10/src/imports/systeminfo/qdeclarativeinputdevicemodel_p.h

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

n/a

[Daniel d'Andrada (dandrader)]

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

* Did CI run pass? If not, please explain why.
No results yet. But run the related qmltest locally and it passed.

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

review: Approve

[Lukáš Tinkl (lukas-kde)]

For the record, fixes the bug for me as well.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2055
http://jenkins.qa.ubuntu.com/job/unity8-ci/6762/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5302
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/177/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25352
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/49/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/177
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25354

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-11-06 10:00:29 +0000
+++ qml/OrientedShell.qml	2015-11-20 18:23:15 +0000
@@ -69,6 +69,11 @@
     }
 
     InputDeviceModel {
+        id: touchPadModel
+        deviceFilter: InputInfo.TouchPad
+    }
+
+    InputDeviceModel {
         id: keyboardsModel
         deviceFilter: InputInfo.Keyboard
     }
@@ -183,7 +188,7 @@
         nativeWidth: root.width
         nativeHeight: root.height
         mode: applicationArguments.mode
-        hasMouse: miceModel.count > deviceConfiguration.ignoredMice
+        hasMouse: miceModel.count + touchPadModel.count > deviceConfiguration.ignoredMice
 
         // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
         //       what's the output device (eg: big TV, desktop monitor, phone display), etc.
@@ -197,7 +202,7 @@
                     return "tablet";
                 }
             } else { // automatic
-                if (miceModel.count > deviceConfiguration.ignoredMice) {
+                if (miceModel.count + touchPadModel.count > deviceConfiguration.ignoredMice) {
                     return "desktop";
                 } else {
                     return deviceConfiguration.category;

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-11-12 20:40:36 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-11-20 18:23:15 +0000
@@ -60,6 +60,10 @@
         deviceFilter: InputInfo.Mouse
     }
     InputDeviceModel {
+        id: touchpadModel
+        deviceFilter: InputInfo.TouchPad
+    }
+    InputDeviceModel {
         id: keyboardsModel
         deviceFilter: InputInfo.Keyboard
     }
@@ -350,6 +354,23 @@
             }
             Row {
                 Button {
+                    text: "Add touchpad"
+                    activeFocusOnPress: false
+                    onClicked: {
+                        MockInputDeviceBackend.addMockDevice("/touchpad" + touchpadModel.count, InputInfo.TouchPad)
+                    }
+                }
+                Button {
+                    text: "Remove touchpad"
+                    activeFocusOnPress: false
+                    onClicked: {
+                        MockInputDeviceBackend.removeDevice("/touchpad" + (touchpadModel.count - 1))
+                    }
+                }
+            }
+
+            Row {
+                Button {
                     text: "Add kbd"
                     activeFocusOnPress: false
                     onClicked: {
@@ -1000,6 +1021,12 @@
             MockInputDeviceBackend.removeDevice("/mouse0");
             tryCompare(shell, "usageScenario", "phone");
             tryCompare(mockOskSettings, "stayHidden", false);
+
+            MockInputDeviceBackend.addMockDevice("/touchpad0", InputInfo.TouchPad);
+            tryCompare(shell, "usageScenario", "desktop");
+
+            MockInputDeviceBackend.removeDevice("/touchpad0");
+            tryCompare(shell, "usageScenario", "phone");
         }
 
         /*