on xenial help sign in
fix swiping away the launcher from the left edge

fixes bug 1367382 and an AP test Fixes: 1367382

commitf13c1248c46e483479a68363588e459a3d1dfcb8 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 23 Sep 2014, 09:25 (12 years ago) parentcdb70f2bcc332e
2 files changed+23
qml/Shell.qml+4 tests/qmltests/tst_Shell.qml+19
qml/Shell.qml+4
@@ -568,6 +568,10 @@ Item {
568568 if (ApplicationManager.focusedApplicationId != "unity8-dash") {
569569 showDash()
570570 }
571+ if (greeter.shown) {
572+ launcher.fadeOut()
573+ greeter.hideRight()
574+ }
571575 }
572576 onDashSwipeChanged: {
573577 if (dashSwipe) {
tests/qmltests/tst_Shell.qml+19
@@ -548,5 +548,24 @@ Row {
548548 expectFail("", "Unlock on boot temporarily disabled");
549549 tryCompare(unlockAllModemsSpy, "count", 1)
550550 }
551+
552+ function test_leftEdgeDragOnGreeter_data() {
553+ return [
554+ {tag: "short swipe", targetX: shell.width / 3, unlocked: false},
555+ {tag: "long swipe", targetX: shell.width / 3 * 2, unlocked: true}
556+ ]
557+ }
558+
559+ function test_leftEdgeDragOnGreeter(data) {
560+ var greeter = findChild(shell, "greeter");
561+ greeter.show();
562+ tryCompare(greeter, "showProgress", 1);
563+
564+ var touchStartX = 2;
565+ var touchStartY = shell.height / 2;
566+ touchFlick(shell, touchStartX, touchStartY, data.targetX, touchStartY);
567+
568+ tryCompare(greeter, "showProgress", data.unlocked ? 0 : 1);
569+ }
551570 }
552571}