Merge "Add support for launcher shortcuts." into ub-launcher3-calgary

This commit is contained in:
Tony Wickham authored and Android (Google) Code Review committed 2016-06-22 20:35:31 +00:00
commit ec1b1c542c
23 files changed
+954 -68

No files matched your search

@@ -641,10 +641,11 @@ public class GridSizeMigrationTask {
// calculate weight
switch (entry.itemType) {
case Favorites.ITEM_TYPE_SHORTCUT:
case Favorites.ITEM_TYPE_DEEP_SHORTCUT:
case Favorites.ITEM_TYPE_APPLICATION: {
verifyIntent(c.getString(indexIntent));
entry.weight = entry.itemType == Favorites.ITEM_TYPE_SHORTCUT
? WT_SHORTCUT : WT_APPLICATION;
entry.weight = entry.itemType == Favorites.ITEM_TYPE_APPLICATION ?
WT_APPLICATION : WT_SHORTCUT;
break;
}
case Favorites.ITEM_TYPE_FOLDER: {
@@ -715,10 +716,11 @@ public class GridSizeMigrationTask {
// calculate weight
switch (entry.itemType) {
case Favorites.ITEM_TYPE_SHORTCUT:
case Favorites.ITEM_TYPE_DEEP_SHORTCUT:
case Favorites.ITEM_TYPE_APPLICATION: {
verifyIntent(c.getString(indexIntent));
entry.weight = entry.itemType == Favorites.ITEM_TYPE_SHORTCUT
? WT_SHORTCUT : WT_APPLICATION;
entry.weight = entry.itemType == Favorites.ITEM_TYPE_APPLICATION ?
WT_APPLICATION : WT_SHORTCUT;
break;
}
case Favorites.ITEM_TYPE_APPWIDGET: {