@@ -320,20 +320,6 @@ Rectangle {
320320 tryCompare(tutorialRight, "opacity", 1);
321321 }
322322
323− function openTutorialBottom() {
324− var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
325− var tutorialBottom = findChild(shell, "tutorialBottom");
326−
327− AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right"];
328− tryCompare(tutorialLeftLoader, "active", false);
329−
330− ApplicationManager.startApplication("dialer-app");
331− ApplicationManager.requestFocusApplication("dialer-app");
332−
333− tryCompare(tutorialBottom, "shown", true);
334− tryCompare(tutorialBottom, "opacity", 1);
335− }
336−
337323 function test_tutorialLeftEdges() {
338324 var tutorial = findChild(shell, "tutorial");
339325 var tutorialLeft = findChild(tutorial, "tutorialLeft");
@@ -562,107 +548,6 @@ Rectangle {
562548 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "right"]);
563549 }
564550
565− function test_tutorialBottomEdges() {
566− var tutorial = findChild(shell, "tutorial");
567− var tutorialBottom = findChild(tutorial, "tutorialBottom");
568− var tutorialLabel = findChild(tutorialBottom, "tutorialLabel");
569− var launcher = findChild(shell, "launcher");
570− var stage = findChild(shell, "stage");
571− var panel = findChild(shell, "panel");
572−
573− openTutorialBottom();
574−
575− tryCompare(tutorial, "running", true);
576− verify(!tutorial.launcherEnabled);
577− verify(!tutorial.spreadEnabled);
578− verify(!tutorial.panelEnabled);
579− verify(tutorialBottom.shown);
580− verify(!launcher.available);
581− verify(!stage.spreadEnabled);
582− verify(!panel.indicators.available);
583− compare(tutorialLabel.text, "Swipe up for recent calls");
584− }
585−
586− function test_tutorialBottomFinish() {
587− var tutorial = findChild(shell, "tutorial");
588− var tutorialBottom = findChild(tutorial, "tutorialBottom");
589−
590− openTutorialBottom();
591− touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
592−
593− tryCompare(tutorialBottom, "shown", false);
594− tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right", "bottom-dialer-app"]);
595−
596− // OK, we did one, just confirm that when all are done, we mark whole tutorial as done.
597− verify(AccountsService.demoEdges);
598− AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right",
599− "bottom-address-book-app",
600− "bottom-com.ubuntu.calculator_calculator",
601− "bottom-dialer-app",
602− "bottom-messaging-app"];
603− verify(!AccountsService.demoEdges);
604− }
605−
606− function test_tutorialBottomAppearsBeforeRight() {
607− // Confirm that if bottom edge and right edge would appear on the
608− // the same app open, bottom edge appears first. (this is a lightly
609− // edited version of openTutorialRight)
610− var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
611− var tutorialRight = findChild(shell, "tutorialRight");
612− var tutorialBottom = findChild(shell, "tutorialBottom");
613−
614− AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
615− ApplicationManager.startApplication("gallery-app");
616− ApplicationManager.startApplication("dialer-app");
617−
618− tryCompare(tutorialLeftLoader, "active", false);
619− tryCompare(tutorialBottom, "shown", true);
620− tryCompare(tutorialBottom, "opacity", 1);
621− tryCompare(tutorialRight, "visible", false);
622− }
623−
624− function test_tutorialBottomOnlyCoversSideStageOnTablet() {
625− loadShell("tablet");
626−
627− var tutorialBottom = findChild(shell, "tutorialBottom");
628− var targetHeight = shell.height - units.gu(4);
629− var mainStageX = units.gu(20);
630− var sideStageX = shell.width - units.gu(20);
631−
632− WindowStateStorage.saveStage("dialer-app", ApplicationInfoInterface.SideStage);
633− openTutorialBottom();
634−
635− touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
636− compare(tutorialBottom.opacity, 1);
637− touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, false, true);
638−
639− touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
640− verify(tutorialBottom.opacity < 1);
641− touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, false, true);
642− }
643−
644− function test_tutorialBottomOnlyCoversMainStageOnTablet() {
645− loadShell("tablet");
646−
647− var tutorialBottom = findChild(shell, "tutorialBottom");
648− var targetHeight = shell.height - units.gu(4);
649− var mainStageX = units.gu(20);
650− var sideStageX = shell.width - units.gu(20);
651−
652− WindowStateStorage.saveStage("notes-app", ApplicationInfoInterface.SideStage);
653− ApplicationManager.startApplication("notes-app");
654−
655− openTutorialBottom();
656−
657− touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
658− compare(tutorialBottom.opacity, 1);
659− touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, false, true);
660−
661− touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
662− verify(tutorialBottom.opacity < 1);
663− touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, false, true);
664− }
665−
666551 function test_activeCallInterruptsTutorial() {
667552 var tutorialLeft = findChild(shell, "tutorialLeft");
668553 verify(tutorialLeft.shown);
@@ -678,31 +563,6 @@ Rectangle {
678563 verify(!tutorialLeft.paused);
679564 }
680565
681− function test_dialerInterruptionWithNoOverlappingTutorials() {
682− var tutorialLeft = findChild(shell, "tutorialLeft");
683− var tutorialBottom = findChild(shell, "tutorialBottom");
684− verify(tutorialLeft.shown);
685−
686− // Start call, hiding left tutorial
687− callManager.foregroundCall = phoneCall;
688− tryCompare(tutorialLeft, "shown", false);
689−
690− // Start dialer app
691− ApplicationManager.startApplication("dialer-app");
692− tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
693− verify(!tutorialBottom.shown);
694−
695− // Dismiss call, bottom tutorial should appear
696− callManager.foregroundCall = null;
697− tryCompare(tutorialBottom, "shown", true);
698− verify(!tutorialLeft.shown);
699−
700− // Get rid of bottom tutorial, left should now be shown
701− touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
702− tryCompare(tutorialBottom, "shown", false);
703− tryCompare(tutorialLeft, "shown", true);
704− }
705−
706566 function test_greeterInterruptsTutorial() {
707567 var tutorialLeft = findChild(shell, "tutorialLeft");
708568 verify(tutorialLeft.shown);
@@ -747,11 +607,9 @@ Rectangle {
747607 var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
748608 var tutorialTopLoader = findChild(shell, "tutorialTopLoader");
749609 var tutorialRightLoader = findChild(shell, "tutorialRightLoader");
750− var tutorialBottomLoader = findChild(shell, "tutorialBottomLoader");
751610 verify(!tutorialLeftLoader.active);
752611 verify(!tutorialTopLoader.active);
753612 verify(tutorialRightLoader.active);
754− verify(!tutorialBottomLoader.active);
755613 compare(AccountsService.demoEdgesCompleted, []);
756614
757615 ApplicationManager.startApplication("dialer-app");