git.iko.soy/unity8
on xenial help sign in
long swipe goes to apps scope only when the focused app is not unity8-dash
2fb6eeehandsome_feng
qml/Shell.qml+4−6
compare with xenial
unifiedsplit
@@ -455,12 +455,10 @@ Item {
455 launcher.fadeOut();
455 launcher.fadeOut();
456 }
456 }
457
457
458− if (!greeter.locked) {
458+ if (!greeter.locked && ApplicationManager.focusedApplicationId != "unity8-dash") {
459− dash.setCurrentScope(0, true, true);
459+ dash.setCurrentScope(0, false, true);
460− if (ApplicationManager.focusedApplicationId != "unity8-dash") {
461− ApplicationManager.requestFocusApplication("unity8-dash");
460+ ApplicationManager.requestFocusApplication("unity8-dash");
462− launcher.fadeOut();
461+ launcher.fadeOut();
463− }
464 }
462 }
465 }
463 }
466
464
tests/qmltests/tst_Shell.qml+5
@@ -463,6 +463,11 @@ Rectangle {
463 function test_longLeftEdgeSwipeTakesToAppsAndResetSearchString() {
463 function test_longLeftEdgeSwipeTakesToAppsAndResetSearchString() {
464 loadShell("phone");
464 loadShell("phone");
465 swipeAwayGreeter();
465 swipeAwayGreeter();
466+ dragLauncherIntoView();
467+ tapOnAppIconInLauncher();
468+ waitUntilApplicationWindowIsFullyVisible();
469+
470+ verify(ApplicationManager.focusedApplicationId !== "unity8-dash")
466
471
467 dashCommunicatorSpy.clear();
472 dashCommunicatorSpy.clear();
468
473