diff options
author | Adam Cohen <adamcohen@google.com> | 2012-05-09 18:00:44 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2012-05-10 10:25:58 -0700 |
commit | 9d5b7d81ae498da060deb387a14b6a8475415592 (patch) | |
tree | 38d1ac33879da5d451e9962a438ee385e2129cd0 /src/com/android/launcher2/Workspace.java | |
parent | 740197b634b59cef484e4465d140acd6c08bc25b (diff) | |
download | android_packages_apps_Trebuchet-9d5b7d81ae498da060deb387a14b6a8475415592.tar.gz android_packages_apps_Trebuchet-9d5b7d81ae498da060deb387a14b6a8475415592.tar.bz2 android_packages_apps_Trebuchet-9d5b7d81ae498da060deb387a14b6a8475415592.zip |
Fix launcher crash when adding widget (issue 6433360)
Change-Id: I0deaef6f4ba9252b76aeb5f2afa8564479557f8c
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 100055689..fd9cc5726 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3125,7 +3125,7 @@ public class Workspace extends SmoothPagedView } private void getFinalPositionForDropAnimation(int[] loc, float[] scaleXY, - DragView dragView, CellLayout layout, ItemInfo info, int[] targetCell, View finalView, + DragView dragView, CellLayout layout, ItemInfo info, int[] targetCell, boolean external) { // Now we animate the dragView, (ie. the widget or shortcut preview) into its final // location and size on the home screen. @@ -3161,7 +3161,7 @@ public class Workspace extends SmoothPagedView int[] finalPos = new int[2]; float scaleXY[] = new float[2]; getFinalPositionForDropAnimation(finalPos, scaleXY, dragView, cellLayout, info, mTargetCell, - finalView, external); + external); Resources res = mLauncher.getResources(); int duration = res.getInteger(R.integer.config_dropAnimMaxDuration) - 200; |