@@ -496,16 +496,8 @@ Item {
496496 function tapOnAppIconInLauncher() {
497497 var launcherPanel = findChild(shell, "launcherPanel");
498498
499− // pick the first icon, the one at the bottom.
499+ // pick the first icon, the one at the top.
500500 var appIcon = findChild(launcherPanel, "launcherDelegate0")
501−
502− // Swipe upwards over the launcher to ensure that this icon
503− // at the bottom is not folded and faded away.
504− var touchStartX = launcherPanel.width / 2;
505− var touchEndY = launcherPanel.height / 2;
506− touchFlick(launcherPanel, touchStartX, 0, touchStartX, touchEndY);
507− tryCompare(launcherPanel, "moving", false);
508−
509501 tap(appIcon, appIcon.width / 2, appIcon.height / 2);
510502 }
511503
@@ -753,13 +745,17 @@ Item {
753745 dragLauncherIntoView();
754746
755747 // Emulate a tap with a finger, where the touch position drifts during the tap.
748+ // This is to test the touch ownership changes. The tap is happening on the button
749+ // area but then drifting into the left edge drag area. This test makes sure
750+ // the touch ownership stays with the button and doesn't move over to the
751+ // left edge drag area.
756752 {
757753 var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");
758754 var startPos = buttonShowDashHome.mapToItem(shell,
759− buttonShowDashHome.width * 0.2,
755+ buttonShowDashHome.width * 0.8,
760756 buttonShowDashHome.height * 0.2);
761757 var endPos = buttonShowDashHome.mapToItem(shell,
762− buttonShowDashHome.width * 0.8,
758+ buttonShowDashHome.width * 0.2,
763759 buttonShowDashHome.height * 0.8);
764760 touchFlick(shell, startPos.x, startPos.y, endPos.x, endPos.y);
765761 }