Launcher: Remove long-press menu

Change-Id: Ie513c0c815fcfa0daa2d5503d3c060ae8e2109c0

1 files changed, 7 insertions, 73 deletions

diff --git a/src/com/cyanogenmod/trebuchet/LauncherModel.java b/src/com/cyanogenmod/trebuchet/LauncherModel.java
index ae0dbf46a..22ea2f2b3 100644
--- a/src/com/cyanogenmod/trebuchet/LauncherModel.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherModel.java
@@ -345,7 +345,7 @@ public class LauncherModel extends BroadcastReceiver {
                             case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                             case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
                             case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
-                            case LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION:
+                            case LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS:
                                 if (!sBgWorkspaceItems.contains(modelItem)) {
                                     sBgWorkspaceItems.add(modelItem);
                                 }
@@ -578,7 +578,7 @@ public class LauncherModel extends BroadcastReceiver {
                             // Fall through
                         case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                         case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
-                        case LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION:
+                        case LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS:
                             if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
                                     item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
                                 sBgWorkspaceItems.add(item);
@@ -665,7 +665,7 @@ public class LauncherModel extends BroadcastReceiver {
                             break;
                         case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                         case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
-                        case LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION:
+                        case LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS:
                             sBgWorkspaceItems.remove(item);
                             break;
                         case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
@@ -1249,8 +1249,6 @@ public class LauncherModel extends BroadcastReceiver {
                             (LauncherSettings.Favorites.SPANX);
                     final int spanYIndex = c.getColumnIndexOrThrow(
                             LauncherSettings.Favorites.SPANY);
-                    final int actionIndex = c.getColumnIndexOrThrow(
-                            LauncherSettings.Favorites.LAUNCHER_ACTION);
 
                     ShortcutInfo info;
                     String intentDescription;
@@ -1273,7 +1271,7 @@ public class LauncherModel extends BroadcastReceiver {
                                     continue;
                                 }
 
-                            case LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION:
+                            case LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS:
 
                                 if (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
                                     info = getShortcutInfo(manager, intent, context, c, iconIndex,
@@ -1295,9 +1293,10 @@ public class LauncherModel extends BroadcastReceiver {
                                             Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
                                     }
                                 } else {
-                                    info = getLauncherActionInfo(c, context, iconTypeIndex,
+                                    info = getShortcutInfo(c, context, iconTypeIndex,
                                             iconPackageIndex, iconResourceIndex, iconIndex,
-                                            titleIndex, actionIndex);
+                                            titleIndex);
+                                    info.itemType = LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS;
                                 }
 
                                 if (info != null) {
@@ -2197,67 +2196,6 @@ public class LauncherModel extends BroadcastReceiver {
         return info;
     }
 
-    /**
-     * Make an ShortcutInfo object for a shortcut that isn't an application.
-     */
-    private LauncherActionInfo getLauncherActionInfo(Cursor c, Context context,
-            int iconTypeIndex, int iconPackageIndex, int iconResourceIndex, int iconIndex,
-            int titleIndex, int actionIndex) {
-
-        Bitmap icon = null;
-        final LauncherActionInfo info = new LauncherActionInfo();
-
-        info.title = c.getString(titleIndex);
-        info.action = LauncherAction.Action.valueOf(c.getString(actionIndex));
-
-        int iconType = c.getInt(iconTypeIndex);
-        switch (iconType) {
-            case LauncherSettings.Favorites.ICON_TYPE_RESOURCE:
-                String packageName = c.getString(iconPackageIndex);
-                String resourceName = c.getString(iconResourceIndex);
-                PackageManager packageManager = context.getPackageManager();
-                info.customIcon = false;
-                // the resource
-                try {
-                    Resources resources = packageManager.getResourcesForApplication(packageName);
-                    if (resources != null) {
-                        final int id = resources.getIdentifier(resourceName, null, null);
-                        icon = Utilities.createIconBitmap(
-                                mIconCache.getFullResIcon(resources, id), context);
-                    }
-                } catch (Exception e) {
-                    // drop this.  we have other places to look for icons
-                }
-                // the db
-                if (icon == null) {
-                    icon = getIconFromCursor(c, iconIndex, context);
-                }
-                // the fallback icon
-                if (icon == null) {
-                    icon = getFallbackIcon();
-                    info.usingFallbackIcon = true;
-                }
-                break;
-            case LauncherSettings.Favorites.ICON_TYPE_BITMAP:
-                icon = getIconFromCursor(c, iconIndex, context);
-                if (icon == null) {
-                    icon = getFallbackIcon();
-                    info.customIcon = false;
-                    info.usingFallbackIcon = true;
-                } else {
-                    info.customIcon = true;
-                }
-                break;
-            default:
-                icon = getFallbackIcon();
-                info.usingFallbackIcon = true;
-                info.customIcon = false;
-                break;
-        }
-        info.setIcon(icon);
-        return info;
-    }
-
     Bitmap getIconFromCursor(Cursor c, int iconIndex, Context context) {
         @SuppressWarnings("all") // suppress dead code warning
         final boolean debug = false;
@@ -2484,8 +2422,6 @@ public class LauncherModel extends BroadcastReceiver {
                     labelA = ((AppWidgetProviderInfo) a).label;
                 } else if (a instanceof ResolveInfo) {
                     labelA = ((ResolveInfo) a).loadLabel(mPackageManager).toString();
-                } else if (a instanceof LauncherAction.Action) {
-                    labelA = mContext.getResources().getString(((LauncherAction.Action) a).getString());
                 }
                 mLabelCache.put(a, labelA);
             }
@@ -2496,8 +2432,6 @@ public class LauncherModel extends BroadcastReceiver {
                     labelB = ((AppWidgetProviderInfo) b).label;
                 } else if (b instanceof ResolveInfo) {
                     labelB = ((ResolveInfo) b).loadLabel(mPackageManager).toString();
-                } else if (b instanceof LauncherAction.Action) {
-                    labelB = mContext.getResources().getString(((LauncherAction.Action) b).getString());
                 }
                 mLabelCache.put(b, labelB);
             }