From ad78da873d6065efa5e211a7b3ac3395ca4a53fb Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 3 Feb 2025 13:30:32 -0800 Subject: [PATCH] Replace .toList() with .collect() .toList() was only introduced to android in api level 34, which is newer than this module's min_sdk_version. Replace it with .collect(). This was found while updating android lint. Flag: EXEMPT refactor Bug: 394096385 Test: Presubmits Change-Id: I71fd1435b7645ea4f1f653c05fef1ddc47adbc14 Merged-In: Id8d1de1531b67a7daf448e45592b7ef78f685fc2 --- src/com/android/launcher3/Launcher.java | 6 ++++-- .../launcher3/celllayout/ReorderAlgorithm.java | 11 +++++++---- .../android/launcher3/model/BaseLauncherBinder.java | 5 +++-- .../launcher3/model/GridSizeMigrationUtil.java | 12 ++++++++---- src/com/android/launcher3/model/data/AppPairInfo.kt | 5 +++-- .../android/launcher3/provider/RestoreDbTask.java | 2 +- .../widget/picker/WidgetRecommendationsView.java | 5 +++-- .../launcher3/widget/picker/WidgetsFullSheet.java | 3 ++- .../picker/WidgetsRecommendationTableLayout.java | 4 +++- .../launcher3/widget/util/WidgetsTableUtils.java | 2 +- 10 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b0ec9b0573..c6e217ffd5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -282,6 +282,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Predicate; import java.util.function.Supplier; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -2240,8 +2241,9 @@ public class Launcher extends StatefulActivity */ @Override public void bindItems(final List items, final boolean forceAnimateIcons) { - bindInflatedItems(items.stream().map(i -> Pair.create( - i, getItemInflater().inflateItem(i, getModelWriter()))).toList(), + bindInflatedItems(items.stream() + .map(i -> Pair.create(i, getItemInflater().inflateItem(i, getModelWriter()))) + .collect(Collectors.toList()), forceAnimateIcons ? new AnimatorSet() : null); } diff --git a/src/com/android/launcher3/celllayout/ReorderAlgorithm.java b/src/com/android/launcher3/celllayout/ReorderAlgorithm.java index c3037831a0..043c3be062 100644 --- a/src/com/android/launcher3/celllayout/ReorderAlgorithm.java +++ b/src/com/android/launcher3/celllayout/ReorderAlgorithm.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map.Entry; +import java.util.stream.Collectors; /** * Contains the logic of a reorder. @@ -143,12 +144,14 @@ public class ReorderAlgorithm { // and not by the views hash which is "random". // The views are sorted twice, once for the X position and a second time for the Y position // to ensure same order everytime. - Comparator comparator = Comparator.comparing( - view -> ((CellLayoutLayoutParams) ((View) view).getLayoutParams()).getCellX() + Comparator comparator = Comparator.comparing( + (View view) -> ((CellLayoutLayoutParams) view.getLayoutParams()).getCellX() ).thenComparing( - view -> ((CellLayoutLayoutParams) ((View) view).getLayoutParams()).getCellY() + (View view) -> ((CellLayoutLayoutParams) view.getLayoutParams()).getCellY() ); - List views = solution.map.keySet().stream().sorted(comparator).toList(); + List views = solution.map.keySet().stream() + .sorted(comparator) + .collect(Collectors.toList()); for (View child : views) { if (child == ignoreView) continue; CellAndSpan c = solution.map.get(child); diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java index 5faa2b83c3..5fad576ab9 100644 --- a/src/com/android/launcher3/model/BaseLauncherBinder.java +++ b/src/com/android/launcher3/model/BaseLauncherBinder.java @@ -412,8 +412,9 @@ public class BaseLauncherBinder { ModelWriter writer = mApp.getModel() .getWriter(false /* verifyChanges */, CellPosMapper.DEFAULT, null); - List> bindItems = items.stream().map(i -> - Pair.create(i, inflater.inflateItem(i, writer, null))).toList(); + List> bindItems = items.stream() + .map(i -> Pair.create(i, inflater.inflateItem(i, writer, null))) + .collect(Collectors.toList()); executeCallbacksTask(c -> c.bindInflatedItems(bindItems), executor); } diff --git a/src/com/android/launcher3/model/GridSizeMigrationUtil.java b/src/com/android/launcher3/model/GridSizeMigrationUtil.java index 942b97cb19..3bddc2ca94 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationUtil.java +++ b/src/com/android/launcher3/model/GridSizeMigrationUtil.java @@ -217,9 +217,12 @@ public class GridSizeMigrationUtil { Collections.sort(hotseatToBeAdded); Collections.sort(workspaceToBeAdded); - List idsInUse = dstWorkspaceItems.stream().map(entry -> entry.id).collect( - Collectors.toList()); - idsInUse.addAll(dstHotseatItems.stream().map(entry -> entry.id).toList()); + List idsInUse = dstWorkspaceItems.stream() + .map(entry -> entry.id) + .collect(Collectors.toList()); + idsInUse.addAll(dstHotseatItems.stream() + .map(entry -> entry.id) + .collect(Collectors.toList())); // Migrate hotseat solveHotseatPlacement(helper, destHotseatSize, @@ -249,7 +252,8 @@ public class GridSizeMigrationUtil { int screenId = destReader.mLastScreenId + 1; while (!workspaceToBeAdded.isEmpty()) { solveGridPlacement(helper, srcReader, destReader, screenId, trgX, trgY, - workspaceToBeAdded, srcWorkspaceItems.stream().map(entry -> entry.id).toList()); + workspaceToBeAdded, + srcWorkspaceItems.stream().map(entry -> entry.id).collect(Collectors.toList())); screenId++; } diff --git a/src/com/android/launcher3/model/data/AppPairInfo.kt b/src/com/android/launcher3/model/data/AppPairInfo.kt index 2eb6154476..d442ec380a 100644 --- a/src/com/android/launcher3/model/data/AppPairInfo.kt +++ b/src/com/android/launcher3/model/data/AppPairInfo.kt @@ -22,6 +22,7 @@ import com.android.launcher3.R import com.android.launcher3.icons.IconCache import com.android.launcher3.logger.LauncherAtom import com.android.launcher3.views.ActivityContext +import java.util.stream.Collectors /** A type of app collection that launches multiple apps into split screen. */ class AppPairInfo() : CollectionInfo() { @@ -54,7 +55,7 @@ class AppPairInfo() : CollectionInfo() { /** Returns the app pair's member apps as an ArrayList of [ItemInfo]. */ override fun getContents(): ArrayList = - ArrayList(contents.stream().map { it as ItemInfo }.toList()) + ArrayList(contents.stream().map { it as ItemInfo }.collect(Collectors.toList())) /** Returns the app pair's member apps as an ArrayList of [WorkspaceItemInfo]. */ override fun getAppContents(): ArrayList = contents @@ -74,7 +75,7 @@ class AppPairInfo() : CollectionInfo() { (ActivityContext.lookupContext(context) as ActivityContext).getDeviceProfile().isTablet return Pair( isTablet || !getFirstApp().isNonResizeable(), - isTablet || !getSecondApp().isNonResizeable() + isTablet || !getSecondApp().isNonResizeable(), ) } diff --git a/src/com/android/launcher3/provider/RestoreDbTask.java b/src/com/android/launcher3/provider/RestoreDbTask.java index 21897bffb8..1e0e1eeb6d 100644 --- a/src/com/android/launcher3/provider/RestoreDbTask.java +++ b/src/com/android/launcher3/provider/RestoreDbTask.java @@ -170,7 +170,7 @@ public class RestoreDbTask { // At this point idp.dbFile contains the name of the dbFile from the previous phone return LauncherFiles.GRID_DB_FILES.stream() .filter(dbName -> new File(dbName).exists()) - .toList(); + .collect(Collectors.toList()); } /** diff --git a/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java b/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java index d84a2195d8..ef87db56e8 100644 --- a/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java +++ b/src/com/android/launcher3/widget/picker/WidgetRecommendationsView.java @@ -222,7 +222,8 @@ public final class WidgetRecommendationsView extends PagedView mDisplayedWidgets.contains(w.componentName)).toList(); + w -> mDisplayedWidgets.contains(w.componentName)).collect(Collectors.toList()); } Context context = getContext(); LayoutInflater inflater = LayoutInflater.from(context); diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index c8ad564a7f..f479874a6d 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -80,6 +80,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; +import java.util.stream.Collectors; import java.util.stream.IntStream; /** @@ -595,7 +596,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet mRecommendedWidgets = mActivityContext.getWidgetPickerDataProvider().get() .getRecommendations() .values().stream() - .flatMap(Collection::stream).toList(); + .flatMap(Collection::stream).collect(Collectors.toList()); mRecommendedWidgetsCount = mWidgetRecommendationsView.setRecommendations( mRecommendedWidgets, mDeviceProfile, diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java index 0bcab60076..216f4d4790 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java @@ -41,6 +41,7 @@ import com.android.launcher3.widget.picker.util.WidgetPreviewContainerSize; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** A {@link TableLayout} for showing recommended widgets. */ public final class WidgetsRecommendationTableLayout extends TableLayout { @@ -163,6 +164,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { } // Perform re-ordering once we have filtered out recommendations that fit. - return filteredRows.stream().sorted(WIDGETS_TABLE_ROW_COUNT_COMPARATOR).toList(); + return filteredRows.stream().sorted(WIDGETS_TABLE_ROW_COUNT_COMPARATOR) + .collect(Collectors.toList()); } } diff --git a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java index df72f07336..1134781fc3 100644 --- a/src/com/android/launcher3/widget/util/WidgetsTableUtils.java +++ b/src/com/android/launcher3/widget/util/WidgetsTableUtils.java @@ -95,7 +95,7 @@ public final class WidgetsTableUtils { List> rows = groupWidgetItemsUsingRowPxWithoutReordering( sortedWidgetItems, context, dp, rowPx, cellPadding); - return rows.stream().sorted(WIDGETS_TABLE_ROW_SIZE_COMPARATOR).toList(); + return rows.stream().sorted(WIDGETS_TABLE_ROW_SIZE_COMPARATOR).collect(Collectors.toList()); } /**