openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "When scrolling in All apps, scroll to last clickable row"" into ub-launcher3-master

This commit is contained in:
Vadim Tryshev 2019-11-15 00:58:22 +00:00 committed by Android (Google) Code Review
parent 498c9d63e1 a354835c6e
commit d82d667194
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/tapl/com/android/launcher3/tapl/AllApps.java
View File

@ -29,8 +29,6 @@ import androidx.test.uiautomator.UiObject2;
import com.android.launcher3.ResourceUtils;
import com.android.launcher3.testing.TestProtocol;
import java.util.stream.Collectors;
/**
* Operations on AllApps opened from Home. Also a parent for All Apps opened from Overview.
*/
@ -77,7 +75,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
return false;
}
if (iconBounds.bottom > displayBottom) {
LauncherInstrumentation.log("hasClickableIcon: icon bottom below bottom offset");
LauncherInstrumentation.log("hasClickableIcon: icon center bellow bottom offset");
return false;
}
LauncherInstrumentation.log("hasClickableIcon: icon is clickable");
@ -126,12 +124,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
displayBottom)) {
mLauncher.scrollToLastVisibleRow(
allAppsContainer,
mLauncher.getObjectsInContainer(allAppsContainer, "icon")
.stream()
.filter(object ->
object.getVisibleBounds().bottom
<= displayBottom)
.collect(Collectors.toList()),
mLauncher.getObjectsInContainer(allAppsContainer, "icon"),
searchBox.getVisibleBounds().bottom
- allAppsContainer.getVisibleBounds().top);
final int newScroll = getAllAppsScroll();

5
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@ -797,15 +797,14 @@ public final class LauncherInstrumentation {
// TODO: Make the gesture steps dependent on the distance so that it can run for various
// screen sizes
final int totalMargin = Math.max(bottomMargin, getBottomGestureMargin(container));
scroll(
container,
Direction.DOWN,
new Rect(
0,
totalMargin / 2,
0,
totalMargin / 2),
0,
Math.max(bottomMargin, getBottomGestureMargin(container))),
80);
}