diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-26 13:01:07 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-26 13:38:33 +0000 |
| commit | 8fb7b9eadd45959d2c3aca9a1bb910ca875cc593 (patch) | |
| tree | a652102d46137188697b4e225d6312f432026c92 /src/com/cyanogenmod/trebuchet/Workspace.java | |
| parent | 8fb6e3e975674d6960dc370ce0d2c7dd80b50117 (diff) | |
| download | android_packages_apps_Trebuchet-8fb7b9eadd45959d2c3aca9a1bb910ca875cc593.tar.gz android_packages_apps_Trebuchet-8fb7b9eadd45959d2c3aca9a1bb910ca875cc593.tar.bz2 android_packages_apps_Trebuchet-8fb7b9eadd45959d2c3aca9a1bb910ca875cc593.zip | |
LauncherActions: Don't use magic intents
Change-Id: I5ee3fbc9b1cdc63407def751bb7639cb54bdb7c3
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Workspace.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 077cd5278..32062e61b 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -1715,8 +1715,8 @@ public class Workspace extends PagedView if (!mOverscrollTransformsDirty) { mOverscrollTransformsDirty = true; cl.setCameraDistance(mDensity * mCameraDistance); - cl.setPivotX(cl.getMeasuredWidth() * (index == 0 ? 0.75f : 0.25f)); cl.setPivotY(cl.getMeasuredHeight() * 0.5f); + cl.setPivotX(cl.getMeasuredWidth() * (index == 0 ? 0.75f : 0.25f)); cl.setOverscrollTransformsDirty(true); } } @@ -3654,6 +3654,7 @@ 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); @@ -3691,6 +3692,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: if (info.container == NO_ID && info instanceof ApplicationInfo) { // Came from all apps -- make a copy info = new ShortcutInfo((ApplicationInfo) info); @@ -3821,7 +3823,7 @@ public class Workspace extends PagedView int[] finalPos = new int[2]; float scaleXY[] = new float[2]; - boolean scalePreview = !(info instanceof PendingAddShortcutInfo); + boolean scalePreview = !(info instanceof PendingAddShortcutInfo || info instanceof PendingAddActionInfo); getFinalPositionForDropAnimation(finalPos, scaleXY, dragView, cellLayout, info, mTargetCell, external, scalePreview); |