From 7d237cd83a758edcb06906b8a536f7626c684e93 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 20 Nov 2023 13:11:57 +0000 Subject: [PATCH] Avoid instantiating unnecessary OverviewTask in getCurrentTask loop - Replaced with moving each size getting methods to a lambda in getCurrentTask Bug: 309820115 Test: presubmit Flag: None Change-Id: Ic625e30bd42f4289bbb1768c2ceeb95e98f51a15 --- .../com/android/launcher3/tapl/BaseOverview.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java index 770fe147eb..07cf97c0d0 100644 --- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java @@ -233,14 +233,13 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { final List taskViews = getTasks(); mLauncher.assertNotEquals("Unable to find a task", 0, taskViews.size()); - final List overviewTasks = taskViews.stream().map( - task -> new OverviewTask(mLauncher, task, this)).toList(); // The widest, and most top-right task should be the current task - return Collections.max(overviewTasks, - Comparator.comparingInt(OverviewTask::getVisibleWidth) - .thenComparingInt(OverviewTask::getTaskCenterX) - .thenComparing( - Comparator.comparing(OverviewTask::getTaskCenterY).reversed())); + UiObject2 currentTask = Collections.max(taskViews, + Comparator.comparingInt((UiObject2 t) -> t.getParent().getVisibleBounds().width()) + .thenComparingInt((UiObject2 t) -> t.getParent().getVisibleCenter().x) + .thenComparing(Comparator.comparing( + (UiObject2 t) -> t.getParent().getVisibleCenter().y).reversed())); + return new OverviewTask(mLauncher, currentTask, this); } /** Returns an overview task matching TestActivity {@param activityNumber}. */