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

/**

/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

import android.annotation.SuppressLint;

import android.content.Context;

import android.graphics.Canvas;

import android.util.ArrayMap;

import android.util.AttributeSet;

import android.util.Log;

import android.view.Gravity;

import android.view.View;

import android.view.ViewDebug;

import android.view.animation.DecelerateInterpolator;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.CellLayout;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.keyboard.ViewGroupFocusHelper;

import com.android.launcher3.pageindicators.PageIndicator;

import com.android.launcher3.util.Thunk;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.Iterator;

import java.util.Map;

    private final LayoutInflater mInflater;

    private final ViewGroupFocusHelper mFocusIndicatorHelper;

    @Thunk final HashMap<View, Runnable> mPendingAnimations = new HashMap<>();

    @Thunk final ArrayMap<View, Runnable> mPendingAnimations = new ArrayMap<>();

    @ViewDebug.ExportedProperty(category = "launcher")

    private final int mMaxCountX;

    public void setFolder(Folder folder) {

        mFolder = folder;

        mKeyListener = new PagedFolderKeyEventListener(folder);

        mPageIndicator = (PageIndicator) folder.findViewById(R.id.folder_page_indicator);

        mPageIndicator = folder.findViewById(R.id.folder_page_indicator);

        initParentViews(folder);

    }

     * @return list of items that could not be bound, probably because we hit the max size limit.

     */

    public ArrayList<ShortcutInfo> bindItems(ArrayList<ShortcutInfo> items) {

        ArrayList<View> icons = new ArrayList<View>();

        ArrayList<ShortcutInfo> extra = new ArrayList<ShortcutInfo>();

        ArrayList<View> icons = new ArrayList<>();

        ArrayList<ShortcutInfo> extra = new ArrayList<>();

        for (ShortcutInfo item : items) {

            if (!ALLOW_FOLDER_SCROLL && icons.size() >= mMaxItemsPerPage) {

    @SuppressLint("RtlHardcoded")

    private void arrangeChildren(ArrayList<View> list, int itemCount, boolean saveChanges) {

        ArrayList<CellLayout> pages = new ArrayList<CellLayout>();

        ArrayList<CellLayout> pages = new ArrayList<>();

        for (int i = 0; i < getChildCount(); i++) {

            CellLayout page = (CellLayout) getChildAt(i);

            page.removeAllViews();

     */

    public void completePendingPageChanges() {

        if (!mPendingAnimations.isEmpty()) {

            HashMap<View, Runnable> pendingViews = new HashMap<>(mPendingAnimations);

            ArrayMap<View, Runnable> pendingViews = new ArrayMap<>(mPendingAnimations);

            for (Map.Entry<View, Runnable> e : pendingViews.entrySet()) {

                e.getKey().animate().cancel();

                e.getValue().run();