diff options
author | nebkat <nebkat@teamhacksung.org> | 2012-12-28 22:18:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-29 02:05:44 -0800 |
commit | 3786ed8df9344d365d063406828afee8293acda8 (patch) | |
tree | 36697f8caa98447f65ef9e538f0dcc6d114fadaa /src/com/cyanogenmod/trebuchet/Workspace.java | |
parent | ce7dcdd77320ff852f4b8b53ededd4220379fe44 (diff) | |
download | android_packages_apps_Trebuchet-3786ed8df9344d365d063406828afee8293acda8.tar.gz android_packages_apps_Trebuchet-3786ed8df9344d365d063406828afee8293acda8.tar.bz2 android_packages_apps_Trebuchet-3786ed8df9344d365d063406828afee8293acda8.zip |
Launcher: Remove long-press menu
Change-Id: Ie513c0c815fcfa0daa2d5503d3c060ae8e2109c0
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Workspace.java')
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index f41febeb9..6e8d720cc 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -55,7 +55,6 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.ViewParent; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; @@ -3615,7 +3614,7 @@ public class Workspace extends PagedView boolean findNearestVacantCell = true; if (pendingInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT || - pendingInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION) { + pendingInfo.itemType == LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) { mTargetCell = findNearestArea(touchXY[0], touchXY[1], spanX, spanY, cellLayout, mTargetCell); float distance = cellLayout.getDistanceFromCell(mDragViewVisualCenter[0], @@ -3662,14 +3661,8 @@ public class Workspace extends PagedView container, screen, mTargetCell, span, null); break; case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: - case LauncherSettings.Favorites.ITEM_TYPE_LAUNCHER_ACTION: - if (pendingInfo instanceof PendingAddActionInfo) { - mLauncher.processActionFromDrop(((PendingAddActionInfo)pendingInfo).action, - container, screen, mTargetCell, null); - } else { - mLauncher.processShortcutFromDrop(pendingInfo.componentName, - container, screen, mTargetCell, null); - } + mLauncher.processShortcutFromDrop(pendingInfo.componentName, + container, screen, mTargetCell, null); break; default: throw new IllegalStateException("Unknown item type: " + @@ -3700,7 +3693,7 @@ public class Workspace extends PagedView switch (info.itemType) { 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 (info.container == NO_ID && info instanceof ApplicationInfo) { // Came from all apps -- make a copy info = new ShortcutInfo((ApplicationInfo) info); @@ -3831,7 +3824,7 @@ public class Workspace extends PagedView int[] finalPos = new int[2]; float scaleXY[] = new float[2]; - boolean scalePreview = !(info instanceof PendingAddShortcutInfo || info instanceof PendingAddActionInfo); + boolean scalePreview = !(info instanceof PendingAddShortcutInfo); getFinalPositionForDropAnimation(finalPos, scaleXY, dragView, cellLayout, info, mTargetCell, external, scalePreview); |