diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-03-21 05:14:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-21 05:14:55 -0700 |
| commit | 08c93d7eca03ec2cd1300ce6a085b59a4670a03b (patch) | |
| tree | ac9eeed6817ad2b1b1abd4afb1c07b2f3a767e6f /src/com/android/launcher2/DragLayer.java | |
| parent | cf4b91fa3f4d2c6b4bce5f6cf177979ea9ca7aad (diff) | |
| parent | a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4 (diff) | |
| download | android_packages_apps_Trebuchet-08c93d7eca03ec2cd1300ce6a085b59a4670a03b.tar.gz android_packages_apps_Trebuchet-08c93d7eca03ec2cd1300ce6a085b59a4670a03b.tar.bz2 android_packages_apps_Trebuchet-08c93d7eca03ec2cd1300ce6a085b59a4670a03b.zip | |
Merge "Eliminate custom alpha handling in CellLayout"
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
| -rw-r--r-- | src/com/android/launcher2/DragLayer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index 4754235ef..94528574d 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -434,7 +434,7 @@ public class DragLayer extends FrameLayout { public void animateViewIntoPosition(DragView dragView, final View child, int duration, final Runnable onFinishAnimationRunnable, View anchorView) { - CellLayoutChildren parentChildren = (CellLayoutChildren) child.getParent(); + ShortcutAndWidgetContainer parentChildren = (ShortcutAndWidgetContainer) child.getParent(); CellLayout parent = (CellLayout) (CellLayout) parentChildren.getParent(); CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams(); parentChildren.measureChild(child); |