git.iko.soy/unity8
on xenial help sign in
Disable bottom edge completely for now
commitf6f81377933a9287ce19a66fc25da392a62d084a authorMichael Terry <michael.terry@canonical.com> dateWed 4 Nov 2015, 16:09 (11 years ago) parentfb44787
2 files changed+10−7
compare with xenial
unifiedsplit
qml/Tutorial/TutorialContent.qml+6−3 tests/qmltests/Tutorial/tst_Tutorial.qml+4−4
qml/Tutorial/TutorialContent.qml+6−3
@@ -119,7 +119,10 @@ Item {
119119
120120 onSkippedChanged: if (skipped && shown) hide()
121121 onIsReadyChanged: if (isReady && !shown) tutorialRightTimer.start()
122− onFinished: AccountsService.markDemoEdgeCompleted("right")
122+ onFinished: {
123+ AccountsService.markDemoEdgeCompleted("right");
124+ root.finish();
125+ }
123126 }
124127
125128 TutorialBottom {
@@ -132,7 +135,7 @@ Item {
132135 readonly property bool skipped: (root.usageScenario !== "phone"
133136 && root.usageScenario !== "tablet")
134137 || AccountsService.demoEdgesCompleted.indexOf("bottom") != -1
135− isReady: tutorialRight.skipped && !skipped && !paused && !keyboardVisible &&
138+ isReady: false /* tutorialRight.skipped && !skipped && !paused && !keyboardVisible &&
136139 // focused app is an app known to have a bottom edge
137140 (ApplicationManager.focusedApplicationId == "dialer-app" ||
138141 ApplicationManager.focusedApplicationId == "webbrowser-app" ||
@@ -140,7 +143,7 @@ Item {
140143 ApplicationManager.focusedApplicationId == "address-book-app" ||
141144 ApplicationManager.focusedApplicationId == "camera-app" ||
142145 ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
143− ApplicationManager.focusedApplicationId == "ubuntu-clock-app")
146+ ApplicationManager.focusedApplicationId == "ubuntu-clock-app") */
144147
145148 /*Timer {
146149 id: tutorialBottomTimer
tests/qmltests/Tutorial/tst_Tutorial.qml+4−4
@@ -517,7 +517,7 @@ Item {
517517 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "right"]);
518518 }
519519
520− function test_tutorialBottomEdges() {
520+ /*function test_tutorialBottomEdges() {
521521 var tutorial = findChild(shell, "tutorial");
522522 var tutorialBottom = findChild(tutorial, "tutorialBottom");
523523 var launcher = findChild(shell, "launcher");
@@ -534,7 +534,7 @@ Item {
534534 verify(!launcher.available);
535535 verify(!stage.spreadEnabled);
536536 verify(!panel.indicators.available);
537− }
537+ }*/
538538
539539 /*function test_tutorialBottomFinish() {
540540 var tutorial = findChild(shell, "tutorial");
@@ -624,11 +624,11 @@ Item {
624624 var tutorialLeft = findChild(shell, "tutorialLeft");
625625 var tutorialTop = findChild(shell, "tutorialTop");
626626 var tutorialRight = findChild(shell, "tutorialRight");
627− var tutorialBottom = findChild(shell, "tutorialBottom");
627+ //var tutorialBottom = findChild(shell, "tutorialBottom");
628628 verify(tutorialLeft.skipped);
629629 verify(tutorialTop.skipped);
630630 verify(!tutorialRight.skipped);
631− verify(tutorialBottom.skipped);
631+ //verify(tutorialBottom.skipped);
632632 compare(AccountsService.demoEdgesCompleted, []);
633633
634634 ApplicationManager.startApplication("dialer-app");