git.iko.soy/unity8
on xenial help sign in
merge with another prereq
commit85148c9aae5677ca133eb42d980c0392f77ff94f authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 28 Jan 2016, 12:12 (11 years ago) parente7549d580bd828
2 files changed+48−23
compare with xenial
unifiedsplit
qml/OrientedShell.qml+11−4 tests/qmltests/tst_OrientedShell.qml+37−19
qml/OrientedShell.qml+11−4
@@ -202,11 +202,18 @@ Rectangle {
202202 return "tablet";
203203 }
204204 } else { // automatic
205− if (miceModel.count + touchPadModel.count > 0) {
206− return "desktop";
207− } else {
208− return deviceConfiguration.category;
205+ var longEdgeWidth = Math.max(root.width, root.height)
206+ if (longEdgeWidth > units.gu(120)) {
207+ if (keyboardsModel.count + miceModel.count + touchPadModel.count > 0) {
208+ return "desktop";
209+ }
210+ } else if (longEdgeWidth > units.gu(90)){
211+ if (miceModel.count + touchPadModel.count > 0) {
212+ return "desktop";
213+ }
209214 }
215+
216+ return deviceConfiguration.category;
210217 }
211218 }
212219
tests/qmltests/tst_OrientedShell.qml+37−19
@@ -1001,37 +1001,55 @@ Rectangle {
10011001 tryCompare(shell, "transformRotationAngle", 0);
10021002 }
10031003
1004− function test_attachRemoveInputDevices() {
1004+ function test_attachRemoveInputDevices_data() {
1005+ return [
1006+ { tag: "small screen, no devices", screenWidth: units.gu(50), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
1007+ { tag: "medium screen, no devices", screenWidth: units.gu(100), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
1008+ { tag: "big screen, no devices", screenWidth: units.gu(200), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
1009+ { tag: "small screen, mouse", screenWidth: units.gu(50), mouse: true, kbd: false, expectedMode: "phone", oskExpected: true },
1010+ { tag: "medium screen, mouse", screenWidth: units.gu(100), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },
1011+ { tag: "big screen, mouse", screenWidth: units.gu(200), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },
1012+ { tag: "small screen, kbd", screenWidth: units.gu(50), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },
1013+ { tag: "medium screen, kbd", screenWidth: units.gu(100), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },
1014+ { tag: "big screen, kbd", screenWidth: units.gu(200), mouse: false, kbd: true, expectedMode: "desktop", oskExpected: false },
1015+ { tag: "small screen, mouse & kbd", screenWidth: units.gu(50), mouse: true, kbd: true, expectedMode: "phone", oskExpected: false },
1016+ { tag: "medium screen, mouse & kbd", screenWidth: units.gu(100), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },
1017+ { tag: "big screen, mouse & kbd", screenWidth: units.gu(200), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },
1018+ ]
1019+ }
1020+
1021+ function test_attachRemoveInputDevices(data) {
10051022 usageModeSelector.selectAutomatic();
10061023 tryCompare(mockUnity8Settings, "usageMode", "Automatic")
10071024
10081025 loadShell("mako")
10091026 var shell = findChild(orientedShell, "shell");
10101027
1011− tryCompare(shell, "usageScenario", "phone");
1012− tryCompare(mockOskSettings, "stayHidden", false);
1028+ var oldWidth = orientedShellLoader.width;
1029+ orientedShellLoader.width = data.screenWidth;
10131030
1014− MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
10151031 tryCompare(shell, "usageScenario", "phone");
1016− tryCompare(mockOskSettings, "stayHidden", true);
1017−
1018− MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
1019− tryCompare(shell, "usageScenario", "desktop");
1020− tryCompare(mockOskSettings, "stayHidden", true);
1021−
1022− MockInputDeviceBackend.removeDevice("/kbd0");
1023− tryCompare(shell, "usageScenario", "desktop");
10241032 tryCompare(mockOskSettings, "stayHidden", false);
10251033
1026− MockInputDeviceBackend.removeDevice("/mouse0");
1027− tryCompare(shell, "usageScenario", "phone");
1028− tryCompare(mockOskSettings, "stayHidden", false);
1034+ if (data.kbd) {
1035+ MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
1036+ }
1037+ if (data.mouse) {
1038+ MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
1039+ }
10291040
1030− MockInputDeviceBackend.addMockDevice("/touchpad0", InputInfo.TouchPad);
1031− tryCompare(shell, "usageScenario", "desktop");
1041+ tryCompare(shell, "usageScenario", data.expectedMode);
1042+ tryCompare(mockOskSettings, "stayHidden", !data.oskExpected);
10321043
1033− MockInputDeviceBackend.removeDevice("/touchpad0");
1034− tryCompare(shell, "usageScenario", "phone");
1044+ if (data.kbd) {
1045+ MockInputDeviceBackend.removeDevice("/kbd0");
1046+ }
1047+ if (data.mouse) {
1048+ MockInputDeviceBackend.removeDevice("/mouse0");
1049+ }
1050+
1051+ // Restore width
1052+ orientedShellLoader.width = oldWidth;
10351053 }
10361054
10371055 /*