Merge "Replace use of java.util.HashMap with android.util.ArrayMap in...

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;

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;

/**

        final ArrayList<ItemInfo> addedItemsFinal = new ArrayList<>();

        final ArrayList<Long> addedWorkspaceScreensFinal = new ArrayList<>();

        HashMap<UserHandle, UserFolderInfo> userFolderMap = new HashMap<>();

        ArrayMap<UserHandle, UserFolderInfo> 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

            scheduleCallbackTask(new CallbackTask() {

                @Override

                public void execute(Callbacks callbacks) {

                    final ArrayList<ItemInfo> addAnimated = new ArrayList<ItemInfo>();

                    final ArrayList<ItemInfo> addNotAnimated = new ArrayList<ItemInfo>();

                    final ArrayList<ItemInfo> addAnimated = new ArrayList<>();

                    final ArrayList<ItemInfo> addNotAnimated = new ArrayList<>();

                    if (!addedItemsFinal.isEmpty()) {

                        ItemInfo info = addedItemsFinal.get(addedItemsFinal.size() - 1);

                        long lastScreenId = info.screenId;