Merge lp:~mzanetti/unity8/drop-ignoredMice into lp:unity8

[Michael Zanetti]

drop the ignoredMice hack again

the new inputinfo backend seems to be clever enough to not
wrongly detect the hardware in there as real a real mouse

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * 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.

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2076
http://jenkins.qa.ubuntu.com/job/unity8-ci/6856/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5526
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/271/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1567
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/270/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/268
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5540
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5540/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25669
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/94/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/270
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/270/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25668

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/DeviceConfiguration.qml'
--- qml/DeviceConfiguration.qml	2015-11-04 14:57:45 +0000
+++ qml/DeviceConfiguration.qml	2015-12-01 14:01:21 +0000
@@ -34,8 +34,6 @@
 
     readonly property alias category: priv.category
 
-    readonly property alias ignoredMice: priv.ignoredMice
-
     readonly property var priv: StateGroup {
         id: priv
 
@@ -55,8 +53,6 @@
         // "phone", "tablet" or "desktop"
         property string category: "phone"
 
-        property int ignoredMice: 0
-
         states: [
             State {
                 name: "mako"
@@ -83,7 +79,6 @@
                     supportedOrientations: Qt.PortraitOrientation
                                          | Qt.LandscapeOrientation
                                          | Qt.InvertedLandscapeOrientation
-                    ignoredMice: 1
                 }
             },
             State {

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-11-20 18:21:02 +0000
+++ qml/OrientedShell.qml	2015-12-01 14:01:21 +0000
@@ -188,7 +188,7 @@
         nativeWidth: root.width
         nativeHeight: root.height
         mode: applicationArguments.mode
-        hasMouse: miceModel.count + touchPadModel.count > deviceConfiguration.ignoredMice
+        hasMouse: miceModel.count + touchPadModel.count > 0
 
         // 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.
@@ -202,7 +202,7 @@
                     return "tablet";
                 }
             } else { // automatic
-                if (miceModel.count + touchPadModel.count > deviceConfiguration.ignoredMice) {
+                if (miceModel.count + touchPadModel.count > 0) {
                     return "desktop";
                 } else {
                     return deviceConfiguration.category;