Merge "Adding item rank when parsing a folder" into ub-launcher3-burnaby

This commit is contained in:
Sunny Goyal
2015-07-06 19:50:34 +00:00
committed by Android (Google) Code Review
@@ -580,6 +580,7 @@ public class AutoInstallsLayout {
int type; int type;
int folderDepth = parser.getDepth(); int folderDepth = parser.getDepth();
int rank = 0;
while ((type = parser.next()) != XmlPullParser.END_TAG || while ((type = parser.next()) != XmlPullParser.END_TAG ||
parser.getDepth() > folderDepth) { parser.getDepth() > folderDepth) {
if (type != XmlPullParser.START_TAG) { if (type != XmlPullParser.START_TAG) {
@@ -587,12 +588,14 @@ public class AutoInstallsLayout {
} }
mValues.clear(); mValues.clear();
mValues.put(Favorites.CONTAINER, folderId); mValues.put(Favorites.CONTAINER, folderId);
mValues.put(Favorites.RANK, rank);
TagParser tagParser = mFolderElements.get(parser.getName()); TagParser tagParser = mFolderElements.get(parser.getName());
if (tagParser != null) { if (tagParser != null) {
final long id = tagParser.parseAndAdd(parser); final long id = tagParser.parseAndAdd(parser);
if (id >= 0) { if (id >= 0) {
folderItems.add(id); folderItems.add(id);
rank++;
} }
} else { } else {
throw new RuntimeException("Invalid folder item " + parser.getName()); throw new RuntimeException("Invalid folder item " + parser.getName());