Merge lp:~mzanetti/unity8/windowed-by-kbd-only into lp:unity8

[Michael Zanetti]

Make big tablets switch to windowed mode by plugging a kbd only

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

nope

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

nope

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

nope

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2137
http://jenkins.qa.ubuntu.com/job/unity8-ci/7118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6105
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/533/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1823
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1718
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1718
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26856
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/270/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/531
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/531/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26855

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Needs Information

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2138
http://jenkins.qa.ubuntu.com/job/unity8-ci/7158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6209
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/573/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1863
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6220
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6220/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27058
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/296/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/571
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27057

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/windowed-by-kbd-only]

2139. By Michael Zanetti on 2016-01-27

drop debug prints

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2139
http://jenkins.qa.ubuntu.com/job/unity8-ci/7165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6233
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/580/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1870
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27105
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/299/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/578
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/578/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27104

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Cimi's testing the silo

 * Did CI run pass? If not, please explain why.
Only failures fixed in other branches

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

review: Approve (code)

[Michał Sawicz (saviq)]

Approving per cimi's silo testing.

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-12-01 13:56:54 +0000
+++ qml/OrientedShell.qml	2016-01-27 23:42:38 +0000
@@ -202,11 +202,18 @@
                     return "tablet";
                 }
             } else { // automatic
-                if (miceModel.count + touchPadModel.count > 0) {
-                    return "desktop";
-                } else {
-                    return deviceConfiguration.category;
+                var longEdgeWidth = Math.max(root.width, root.height)
+                if (longEdgeWidth > units.gu(120)) {
+                    if (keyboardsModel.count + miceModel.count + touchPadModel.count > 0) {
+                        return "desktop";
+                    }
+                } else if (longEdgeWidth > units.gu(90)){
+                    if (miceModel.count + touchPadModel.count > 0) {
+                        return "desktop";
+                    }
                 }
+
+                return deviceConfiguration.category;
             }
         }
 

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2016-01-27 23:42:38 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2016-01-27 23:42:38 +0000
@@ -1001,37 +1001,55 @@
             tryCompare(shell, "transformRotationAngle", 0);
         }
 
-        function test_attachRemoveInputDevices() {
+        function  test_attachRemoveInputDevices_data() {
+            return [
+                { tag: "small screen, no devices", screenWidth: units.gu(50), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
+                { tag: "medium screen, no devices", screenWidth: units.gu(100), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
+                { tag: "big screen, no devices", screenWidth: units.gu(200), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
+                { tag: "small screen, mouse", screenWidth: units.gu(50), mouse: true, kbd: false, expectedMode: "phone", oskExpected: true },
+                { tag: "medium screen, mouse", screenWidth: units.gu(100), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },
+                { tag: "big screen, mouse", screenWidth: units.gu(200), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },
+                { tag: "small screen, kbd", screenWidth: units.gu(50), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },
+                { tag: "medium screen, kbd", screenWidth: units.gu(100), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },
+                { tag: "big screen, kbd", screenWidth: units.gu(200), mouse: false, kbd: true, expectedMode: "desktop", oskExpected: false },
+                { tag: "small screen, mouse & kbd", screenWidth: units.gu(50), mouse: true, kbd: true, expectedMode: "phone", oskExpected: false },
+                { tag: "medium screen, mouse & kbd", screenWidth: units.gu(100), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },
+                { tag: "big screen, mouse & kbd", screenWidth: units.gu(200), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },
+            ]
+        }
+
+        function test_attachRemoveInputDevices(data) {
             usageModeSelector.selectAutomatic();
             tryCompare(mockUnity8Settings, "usageMode", "Automatic")
 
             loadShell("mako")
             var shell = findChild(orientedShell, "shell");
 
-            tryCompare(shell, "usageScenario", "phone");
-            tryCompare(mockOskSettings, "stayHidden", false);
-
-            MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
-            tryCompare(shell, "usageScenario", "phone");
-            tryCompare(mockOskSettings, "stayHidden", true);
-
-            MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
-            tryCompare(shell, "usageScenario", "desktop");
-            tryCompare(mockOskSettings, "stayHidden", true);
-
-            MockInputDeviceBackend.removeDevice("/kbd0");
-            tryCompare(shell, "usageScenario", "desktop");
-            tryCompare(mockOskSettings, "stayHidden", false);
-
-            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");
+            var oldWidth = orientedShellLoader.width;
+            orientedShellLoader.width = data.screenWidth;
+
+            tryCompare(shell, "usageScenario", "phone");
+            tryCompare(mockOskSettings, "stayHidden", false);
+
+            if (data.kbd) {
+                MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
+            }
+            if (data.mouse) {
+                MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
+            }
+
+            tryCompare(shell, "usageScenario", data.expectedMode);
+            tryCompare(mockOskSettings, "stayHidden", !data.oskExpected);
+
+            if (data.kbd) {
+                MockInputDeviceBackend.removeDevice("/kbd0");
+            }
+            if (data.mouse) {
+                MockInputDeviceBackend.removeDevice("/mouse0");
+            }
+
+            // Restore width
+            orientedShellLoader.width = oldWidth;
         }
 
         /*