Merge "Using cellX and cellY for comparing position when rank is not...

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

/**

 * Represents a set of icons chosen by the user or generated by the system.

    void bind(FolderInfo info) {

        mInfo = info;

        ArrayList<ShortcutInfo> children = info.contents;

        Collections.sort(children, Utilities.RANK_COMPARATOR);

        Collections.sort(children, ITEM_POS_COMPARATOR);

        ArrayList<ShortcutInfo> overflow = mContent.bindItems(children);

            onDragOver(mDragObject, 1);

        }

    }

    // Compares item position based on rank and position giving priority to the rank.

    private static final Comparator<ItemInfo> ITEM_POS_COMPARATOR = new Comparator<ItemInfo>() {

        @Override

        public int compare(ItemInfo lhs, ItemInfo rhs) {

            if (lhs.rank != rhs.rank) {

                return lhs.rank - rhs.rank;

            } else if (lhs.cellY != rhs.cellY) {

                return lhs.cellY - rhs.cellY;

            } else {

                return lhs.cellX - rhs.cellX;

            }

        }

    };

}

import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Comparator;

import java.util.Locale;

import java.util.Set;

import java.util.regex.Matcher;

        }

    }

    public static final Comparator<ItemInfo> RANK_COMPARATOR = new Comparator<ItemInfo>() {

        @Override

        public int compare(ItemInfo lhs, ItemInfo rhs) {

            return lhs.rank - rhs.rank;

        }

    };

    /**

     * Find the first vacant cell, if there is one.

     *