diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-06-13 16:36:59 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-06-14 16:46:03 -0700 |
| commit | e8b5d20d94cb03878137a7fdf65d7a88270b73f8 (patch) | |
| tree | dd8ffb39af72269442876e68c81e93be7f0ac605 /src/com/android/launcher3/dragndrop | |
| parent | fb94f485ee4059a0a65e2b141982f936f36d91e7 (diff) | |
| download | android_packages_apps_Trebuchet-e8b5d20d94cb03878137a7fdf65d7a88270b73f8.tar.gz android_packages_apps_Trebuchet-e8b5d20d94cb03878137a7fdf65d7a88270b73f8.tar.bz2 android_packages_apps_Trebuchet-e8b5d20d94cb03878137a7fdf65d7a88270b73f8.zip | |
Fixing bug in getDescendantCoordRelativeToParent where it was
calculating the coordinates relative to the root's parent
The bug went unnoticed for so long, as its only used in DragLayer
which is positioned at 0,0 in its parent
Change-Id: I101cda1f1fa919c0faf9b23b1eeb05764bdf1a40
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 765ad64e9..5d212d8aa 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -42,7 +42,6 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.android.launcher3.AppWidgetResizeFrame; -import com.android.launcher3.BaseContainerView; import com.android.launcher3.CellLayout; import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.ItemInfo; @@ -56,7 +55,6 @@ import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; -import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.Folder; @@ -468,7 +466,7 @@ public class DragLayer extends InsettableFrameLayout { */ public float getDescendantCoordRelativeToSelf(View descendant, int[] coord, boolean includeRootScroll) { - return Utilities.getDescendantCoordRelativeToParent(descendant, this, + return Utilities.getDescendantCoordRelativeToAncestor(descendant, this, coord, includeRootScroll); } |