git.iko.soy/unity8
on xenial help sign in
Disable bottom edge completely for now
f6f8137Michael Terry
qml/Tutorial/TutorialContent.qml+6−3
compare with xenial
unifiedsplit
@@ -119,7 +119,10 @@ Item {
119
119
120 onSkippedChanged: if (skipped && shown) hide()
120 onSkippedChanged: if (skipped && shown) hide()
121 onIsReadyChanged: if (isReady && !shown) tutorialRightTimer.start()
121 onIsReadyChanged: if (isReady && !shown) tutorialRightTimer.start()
122+ onFinished: {
122− onFinished: AccountsService.markDemoEdgeCompleted("right")
123+ AccountsService.markDemoEdgeCompleted("right");
124+ root.finish();
125+ }
123 }
126 }
124
127
125 TutorialBottom {
128 TutorialBottom {
@@ -132,7 +135,7 @@ Item {
132 readonly property bool skipped: (root.usageScenario !== "phone"
135 readonly property bool skipped: (root.usageScenario !== "phone"
133 && root.usageScenario !== "tablet")
136 && root.usageScenario !== "tablet")
134 || AccountsService.demoEdgesCompleted.indexOf("bottom") != -1
137 || AccountsService.demoEdgesCompleted.indexOf("bottom") != -1
135− isReady: tutorialRight.skipped && !skipped && !paused && !keyboardVisible &&
138+ isReady: false /* tutorialRight.skipped && !skipped && !paused && !keyboardVisible &&
136 // focused app is an app known to have a bottom edge
139 // focused app is an app known to have a bottom edge
137 (ApplicationManager.focusedApplicationId == "dialer-app" ||
140 (ApplicationManager.focusedApplicationId == "dialer-app" ||
138 ApplicationManager.focusedApplicationId == "webbrowser-app" ||
141 ApplicationManager.focusedApplicationId == "webbrowser-app" ||
@@ -140,7 +143,7 @@ Item {
140 ApplicationManager.focusedApplicationId == "address-book-app" ||
143 ApplicationManager.focusedApplicationId == "address-book-app" ||
141 ApplicationManager.focusedApplicationId == "camera-app" ||
144 ApplicationManager.focusedApplicationId == "camera-app" ||
142 ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
145 ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
143− ApplicationManager.focusedApplicationId == "ubuntu-clock-app")
146+ ApplicationManager.focusedApplicationId == "ubuntu-clock-app") */
144
147
145 /*Timer {
148 /*Timer {
146 id: tutorialBottomTimer
149 id: tutorialBottomTimer
tests/qmltests/Tutorial/tst_Tutorial.qml+4−4
@@ -517,7 +517,7 @@ Item {
517 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "right"]);
517 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "right"]);
518 }
518 }
519
519
520− function test_tutorialBottomEdges() {
520+ /*function test_tutorialBottomEdges() {
521 var tutorial = findChild(shell, "tutorial");
521 var tutorial = findChild(shell, "tutorial");
522 var tutorialBottom = findChild(tutorial, "tutorialBottom");
522 var tutorialBottom = findChild(tutorial, "tutorialBottom");
523 var launcher = findChild(shell, "launcher");
523 var launcher = findChild(shell, "launcher");
@@ -534,7 +534,7 @@ Item {
534 verify(!launcher.available);
534 verify(!launcher.available);
535 verify(!stage.spreadEnabled);
535 verify(!stage.spreadEnabled);
536 verify(!panel.indicators.available);
536 verify(!panel.indicators.available);
537− }
537+ }*/
538
538
539 /*function test_tutorialBottomFinish() {
539 /*function test_tutorialBottomFinish() {
540 var tutorial = findChild(shell, "tutorial");
540 var tutorial = findChild(shell, "tutorial");
@@ -624,11 +624,11 @@ Item {
624 var tutorialLeft = findChild(shell, "tutorialLeft");
624 var tutorialLeft = findChild(shell, "tutorialLeft");
625 var tutorialTop = findChild(shell, "tutorialTop");
625 var tutorialTop = findChild(shell, "tutorialTop");
626 var tutorialRight = findChild(shell, "tutorialRight");
626 var tutorialRight = findChild(shell, "tutorialRight");
627− var tutorialBottom = findChild(shell, "tutorialBottom");
627+ //var tutorialBottom = findChild(shell, "tutorialBottom");
628 verify(tutorialLeft.skipped);
628 verify(tutorialLeft.skipped);
629 verify(tutorialTop.skipped);
629 verify(tutorialTop.skipped);
630 verify(!tutorialRight.skipped);
630 verify(!tutorialRight.skipped);
631− verify(tutorialBottom.skipped);
631+ //verify(tutorialBottom.skipped);
632 compare(AccountsService.demoEdgesCompleted, []);
632 compare(AccountsService.demoEdgesCompleted, []);
633
633
634 ApplicationManager.startApplication("dialer-app");
634 ApplicationManager.startApplication("dialer-app");