Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c0c746a authored by Jon Miranda's avatar Jon Miranda Committed by android-build-merger
Browse files

Fix bug where deep shortcut drag view target was skewed to the right. 

am: aa6f66aa

Change-Id: I87a99bfc52d7c8398099fc2230f02c0c7b6dee22
parents 07557e81 aa6f66aa

src/com/android/launcher3/Workspace.java

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import com.android.launcher3.folder.FolderIcon; 
import com.android.launcher3.graphics.DragPreviewProvider;

import com.android.launcher3.graphics.PreloadIconDrawable;

import com.android.launcher3.popup.PopupContainerWithArrow;

import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;

import com.android.launcher3.userevent.nano.LauncherLogProto.Target;

import com.android.launcher3.util.ItemInfoMatcher;
@@ -2262,6 +2263,8 @@ public class Workspace extends PagedView 
            int previewSize = grid.folderIconSizePx;

            dragVisualizeOffset = new Point(- halfPadding, halfPadding - child.getPaddingTop());

            dragRect = new Rect(0, child.getPaddingTop(), child.getWidth(), previewSize);

        } else if (previewProvider instanceof ShortcutDragPreviewProvider) {

            dragVisualizeOffset = new Point(- halfPadding, halfPadding);

        }



        // Clear the pressed state if necessary

src/com/android/launcher3/shortcuts/ShortcutsItemView.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick 
        mIconShift.x = mIconLastTouchPos.x - sv.getIconCenter().x;

        mIconShift.y = mIconLastTouchPos.y - mLauncher.getDeviceProfile().iconSizePx;



        DragView dv = mLauncher.getWorkspace().beginDragShared(sv.getBubbleText(),

        DragView dv = mLauncher.getWorkspace().beginDragShared(sv.getIconView(),

                (PopupContainerWithArrow) getParent(), sv.getFinalInfo(),

                new ShortcutDragPreviewProvider(sv.getIconView(), mIconShift), new DragOptions());

        dv.animateShift(-mIconShift.x, -mIconShift.y);