git.iko.soy/unity8
on xenial help sign in
Fix merge
230c5f6Albert Astals Cid
tests/qmltests/Launcher/tst_Launcher.qml+1−1
compare with xenial
unifiedsplit
@@ -215,7 +215,7 @@ Item {
215 // Now do check that snapping is in fact enabled
215 // Now do check that snapping is in fact enabled
216 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
216 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
217
217
218− removeTimeConstraintsFromDirectionalDragAreas(root);
218+ removeTimeConstraintsFromSwipeAreas(root);
219 }
219 }
220
220
221 function dragLauncherIntoView() {
221 function dragLauncherIntoView() {
tests/qmltests/tst_Shell.qml+1−1
@@ -660,7 +660,7 @@ Rectangle {
660 function swipeAwayGreeter() {
660 function swipeAwayGreeter() {
661 var greeter = findChild(shell, "greeter");
661 var greeter = findChild(shell, "greeter");
662 tryCompare(greeter, "fullyShown", true);
662 tryCompare(greeter, "fullyShown", true);
663− removeTimeConstraintsFromDirectionalDragAreas(greeter);
663+ removeTimeConstraintsFromSwipeAreas(greeter);
664
664
665 var touchX = shell.width - (shell.edgeSize / 2);
665 var touchX = shell.width - (shell.edgeSize / 2);
666 var touchY = shell.height / 2;
666 var touchY = shell.height / 2;