From 44c3ddcf49a63f78faa8d060cc7b105d35937221 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Wed, 14 Jun 2017 17:50:51 -0700 Subject: [PATCH] Replace use of java.util.HashMap with android.util.ArrayMap in AddWorkspaceItemsTask class Bug: 62466540 Change-Id: Iae1e7a639754d08ad7dbb90b20e2e4e205a078f8 --- .../android/launcher3/model/AddWorkspaceItemsTask.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java index b27ccfd017..68012c4ba1 100644 --- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java +++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java @@ -20,9 +20,9 @@ import android.content.Intent; import android.content.pm.LauncherActivityInfo; import android.os.Process; import android.os.UserHandle; +import android.util.ArrayMap; import android.util.LongSparseArray; import android.util.Pair; - import com.android.launcher3.AllAppsList; import com.android.launcher3.AppInfo; import com.android.launcher3.FolderInfo; @@ -39,9 +39,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.ManagedProfileHeuristic.UserFolderInfo; import com.android.launcher3.util.Provider; - import java.util.ArrayList; -import java.util.HashMap; import java.util.List; /** @@ -68,7 +66,7 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask { final ArrayList addedItemsFinal = new ArrayList<>(); final ArrayList addedWorkspaceScreensFinal = new ArrayList<>(); - HashMap userFolderMap = new HashMap<>(); + ArrayMap userFolderMap = new ArrayMap<>(); // Get the list of workspace screens. We need to append to this list and // can not use sBgWorkspaceScreens because loadWorkspace() may not have been @@ -146,8 +144,8 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask { scheduleCallbackTask(new CallbackTask() { @Override public void execute(Callbacks callbacks) { - final ArrayList addAnimated = new ArrayList(); - final ArrayList addNotAnimated = new ArrayList(); + final ArrayList addAnimated = new ArrayList<>(); + final ArrayList addNotAnimated = new ArrayList<>(); if (!addedItemsFinal.isEmpty()) { ItemInfo info = addedItemsFinal.get(addedItemsFinal.size() - 1); long lastScreenId = info.screenId;