diff options
| author | Tony Wickham <twickham@google.com> | 2016-06-22 20:35:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-22 20:35:31 +0000 |
| commit | ec1b1c542ca0648747b3b0bc3fd45922caa8ddaa (patch) | |
| tree | fa66aad52a372f49721795662123ef48df261d46 /src/com/android/launcher3/model | |
| parent | 8e6a8004808fbbf782812a6cd75324a7008cc610 (diff) | |
| parent | bfbf7f9f4a0b300613f0ff27a4eb592d88c08325 (diff) | |
| download | android_packages_apps_Trebuchet-ec1b1c542ca0648747b3b0bc3fd45922caa8ddaa.tar.gz android_packages_apps_Trebuchet-ec1b1c542ca0648747b3b0bc3fd45922caa8ddaa.tar.bz2 android_packages_apps_Trebuchet-ec1b1c542ca0648747b3b0bc3fd45922caa8ddaa.zip | |
Merge "Add support for launcher shortcuts." into ub-launcher3-calgary
Diffstat (limited to 'src/com/android/launcher3/model')
| -rw-r--r-- | src/com/android/launcher3/model/GridSizeMigrationTask.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java index 9db79f061..cb1acaac2 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTask.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java @@ -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: { |