@@ -605,38 +605,6 @@ Rectangle {
605 compare(ApplicationManager.get(0).appId, "unity8-dash");
605 compare(ApplicationManager.get(0).appId, "unity8-dash");
608− function test_phoneLeftEdgeDrag_data() {
610− {tag: "without launcher",
611− revealLauncher: false, swipeLength: units.gu(30), appHides: true, focusedApp: "dialer-app",
612− launcherHides: true, greeterShown: false},
614− {tag: "with launcher",
615− revealLauncher: true, swipeLength: units.gu(30), appHides: true, focusedApp: "dialer-app",
616− launcherHides: true, greeterShown: false},
618− {tag: "small swipe",
619− revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app",
620− launcherHides: false, greeterShown: false},
623− revealLauncher: false, swipeLength: units.gu(30), appHides: true, focusedApp: "dialer-app",
624− launcherHides: true, greeterShown: false},
626− {tag: "small swipe with greeter",
627− revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app",
628− launcherHides: false, greeterShown: true},
630− {tag: "long swipe with greeter",
631− revealLauncher: false, swipeLength: units.gu(30), appHides: true, focusedApp: "dialer-app",
632− launcherHides: true, greeterShown: true},
634− {tag: "swipe over dash",
635− revealLauncher: false, swipeLength: units.gu(30), appHides: true, focusedApp: "unity8-dash",
636− launcherHides: false, greeterShown: false},
640 function test_snapDecisionDismissalReturnsFocus() {
608 function test_snapDecisionDismissalReturnsFocus() {
641 loadShell("phone");
609 loadShell("phone");
642 swipeAwayGreeter();
610 swipeAwayGreeter();
@@ -701,80 +669,6 @@ Rectangle {
701 mockNotificationsModel.append(n)
669 mockNotificationsModel.append(n)
704− function test_phoneLeftEdgeDrag(data) {
707− dragLauncherIntoView();
708− var appSurfaceId = topLevelSurfaceList.nextId;
709− tapOnAppIconInLauncher();
710− waitUntilAppWindowIsFullyLoaded(appSurfaceId);
712− var greeter = findChild(shell, "greeter");
713− if (data.greeterShown) {
717− if (data.revealLauncher) {
718− dragLauncherIntoView();
721− swipeFromLeftEdge(data.swipeLength);
722− if (data.appHides) {
723− waitUntilDashIsFocused();
724− tryCompare(greeter, "shown", false);
726− tryCompare(greeter, "fullyShown", data.greeterShown);
729− var launcher = findChild(shell, "launcherPanel");
730− tryCompare(launcher, "x", data.launcherHides ? -launcher.width : 0)
732− //FIXME: This check fails. Don't understand the rationale behind it.
734− // Make sure the helper for sliding out the launcher wasn't touched. We want to fade it out here.
735− var animateTimer = findInvisibleChild(shell, "animateTimer");
736− compare(animateTimer.nextState, "visible");
740− function test_tabletLeftEdgeDrag_data() {
742− {tag: "without password", user: "no-password", loggedIn: true},
743− {tag: "with password", user: "has-password", loggedIn: false},
747− function test_tabletLeftEdgeDrag(data) {
748− setLightDMMockMode("full");
749− loadShell("tablet");
751− selectUser(data.user)
753− swipeFromLeftEdge(shell.width * 0.75)
754− wait(500) // to give time to handle dash() signal from Launcher
755− confirmLoggedIn(data.loggedIn)
758− function test_longLeftEdgeSwipeTakesToAppsAndResetSearchString() {
761− dragLauncherIntoView();
762− dashCommunicatorSpy.clear();
764− var appSurfaceId = topLevelSurfaceList.nextId;
765− tapOnAppIconInLauncher();
766− waitUntilAppWindowIsFullyLoaded(appSurfaceId);
768− tryCompareFunction(function() { return ApplicationManager.focusedApplicationId !== "unity8-dash"; }, true);
771− swipeFromLeftEdge(units.gu(30));
773− tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
775− compare(dashCommunicatorSpy.count, 1);
778 function test_ClickUbuntuIconInLauncherTakesToAppsAndResetSearchString() {
672 function test_ClickUbuntuIconInLauncherTakesToAppsAndResetSearchString() {
779 loadShell("phone");
673 loadShell("phone");
780 swipeAwayGreeter();
674 swipeAwayGreeter();
@@ -913,39 +807,6 @@ Rectangle {
913 LightDM.Users.mockMode = mode;
807 LightDM.Users.mockMode = mode;
917− Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419
919− When the user minimizes an application (left-edge swipe) he should always end up in the
920− "Applications" scope view.
923− - reveal launcher and launch an app that covers the dash
924− - perform long left edge swipe to go minimize the app and go back to the dash.
925− - verify the setCurrentScope() D-Bus call to the dash has been called for the correct scope id.
927− function test_minimizingAppTakesToDashApps() {
930− dragLauncherIntoView();
932− // Launch an app from the launcher
933− var appSurfaceId = topLevelSurfaceList.nextId;
934− tapOnAppIconInLauncher();
935− waitUntilAppWindowIsFullyLoaded(appSurfaceId);
937− verify(ApplicationManager.focusedApplicationId !== "unity8-dash")
939− dashCommunicatorSpy.clear();
940− // Minimize the application we just launched
941− swipeFromLeftEdge(shell.width * 0.75);
943− tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
945− compare(dashCommunicatorSpy.count, 1);
946− compare(dashCommunicatorSpy.signalArguments[0][0], 0);
949 function test_showInputMethod() {
810 function test_showInputMethod() {
950 loadShell("phone");
811 loadShell("phone");
951 swipeAwayGreeter();
812 swipeAwayGreeter();
@@ -1166,7 +1027,7 @@ Rectangle {
1167 // Place the mouse against the window/screen edge and push beyond the barrier threshold
1028 // Place the mouse against the window/screen edge and push beyond the barrier threshold
1168 mouseMove(shell, 0, shell.height / 2);
1029 mouseMove(shell, 0, shell.height / 2);
1169− launcher.pushEdge(EdgeBarrierSettings.pushThreshold * 1.1);
1030+ launcher.pushEdge(EdgeBarrierSettings.pushThreshold * .8);
1171 var panel = findChild(launcher, "launcherPanel");
1032 var panel = findChild(launcher, "launcherPanel");
1172 verify(panel);
1033 verify(panel);
@@ -1186,9 +1047,7 @@ Rectangle {
1186 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
1047 waitUntilAppWindowIsFullyLoaded(appSurfaceId);
1188 // Minimize the application we just launched
1049 // Minimize the application we just launched
1189− swipeFromLeftEdge(shell.width * 0.75);
1050+ swipeFromLeftEdge(units.gu(15));
1191− waitUntilDashIsFocused();
1193 showGreeter();
1052 showGreeter();
@@ -2779,5 +2638,69 @@ Rectangle {
2780 GSettingsController.setEnableLauncher(true);
2639 GSettingsController.setEnableLauncher(true);
2642+ function test_indicatorMenuEnabledSetting_data() {
2644+ {tag: "indicator menu enabled", enabled: true},
2645+ {tag: "indicator menu disabled", enabled: false}
2649+ function test_indicatorMenuEnabledSetting(data) {
2650+ loadShell("phone");
2652+ GSettingsController.setEnableIndicatorMenu(data.enabled);
2654+ var panel = findChild(shell, "panel");
2655+ compare(panel.indicators.available, data.enabled);
2657+ GSettingsController.setEnableIndicatorMenu(true);
2660+ function test_spreadDisabled_data() {
2662+ { tag: "enabled", spreadEnabled: true },
2663+ { tag: "disabled", spreadEnabled: false }
2667+ function test_spreadDisabled(data) {
2668+ loadShell("phone");
2669+ swipeAwayGreeter();
2670+ var stage = findChild(shell, "stage");
2671+ stage.spreadEnabled = data.spreadEnabled;
2674+ touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
2675+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2677+ stage.closeSpread();
2678+ tryCompare(stage, "state", "staged");
2680+ // Try by edge push
2681+ mouseMove(stage, stage.width - 1, units.gu(10));
2682+ for (var i = 0; i < units.gu(10); i++) {
2683+ stage.pushRightEdge(1);
2685+ mouseMove(stage, stage.width - units.gu(5), units.gu(10));
2686+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2688+ stage.closeSpread();
2689+ tryCompare(stage, "state", "staged");
2692+ keyPress(Qt.Key_Alt);
2693+ keyClick(Qt.Key_Tab);
2694+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2695+ keyRelease(Qt.Key_Alt);
2697+ stage.closeSpread();
2698+ tryCompare(stage, "state", "staged");
2701+ keyPress(Qt.Key_W, Qt.MetaModifier)
2702+ tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2703+ keyRelease(Qt.Key_W, Qt.MetaModifier)