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

Commit 7f72718c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Fix bug where icon 'jumps' on long press. am: 31942e78 

Change-Id: I7090a0e5f6554a1f47d4939c25611fd18ec291c0
parents cae48a2a 31942e78

quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java

+10 −6
Original line number Diff line number Diff line
@@ -227,13 +227,17 @@ public class ClipAnimationHelper { 
        dl.getDescendantRectRelativeToSelf(ttv, targetRect.rect);

        updateTargetRect(targetRect);



        // Transform the clip relative to the target rect.

        if (target == null) {

            // Transform the clip relative to the target rect. Only do this in the case where we

            // aren't applying the insets to the app windows (where the clip should be in target app

            // space)

            float scale = mTargetRect.width() / mSourceRect.width();

            mSourceWindowClipInsets.left = mSourceWindowClipInsets.left * scale;

            mSourceWindowClipInsets.top = mSourceWindowClipInsets.top * scale;

            mSourceWindowClipInsets.right = mSourceWindowClipInsets.right * scale;

            mSourceWindowClipInsets.bottom = mSourceWindowClipInsets.bottom * scale;

        }

    }



    private void updateStackBoundsToMultiWindowTaskSize(BaseDraggingActivity activity) {

        ISystemUiProxy sysUiProxy = RecentsModel.getInstance(activity).getSystemUiProxy();

src/com/android/launcher3/Workspace.java

+9 −1
Original line number Diff line number Diff line
@@ -1552,6 +1552,14 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


    public DragView beginDragShared(View child, DragSource source, ItemInfo dragObject,

            DragPreviewProvider previewProvider, DragOptions dragOptions) {

        float iconScale = 1f;

        if (child instanceof BubbleTextView) {

            Drawable icon = ((BubbleTextView) child).getIcon();

            if (icon instanceof FastBitmapDrawable) {

                iconScale = ((FastBitmapDrawable) icon).getAnimatedScale();

            }

        }



        child.clearFocus();

        child.setPressed(false);

        mOutlineProvider = previewProvider;
@@ -1603,7 +1611,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
        }



        DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source,

                dragObject, dragVisualizeOffset, dragRect, scale, dragOptions);

                dragObject, dragVisualizeOffset, dragRect, scale * iconScale, scale, dragOptions);

        dv.setIntrinsicIconScaleFactor(dragOptions.intrinsicIconScaleFactor);

        return dv;

    }

src/com/android/launcher3/dragndrop/DragController.java

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class DragController implements DragDriver.EventListener, TouchController 
     */

    public DragView startDrag(Bitmap b, int dragLayerX, int dragLayerY,

            DragSource source, ItemInfo dragInfo, Point dragOffset, Rect dragRegion,

            float initialDragViewScale, DragOptions options) {

            float initialDragViewScale, float dragViewScaleOnDrop, DragOptions options) {

        if (PROFILE_DRAWING_DURING_DRAG) {

            android.os.Debug.startMethodTracing("Launcher");

        }
@@ -169,7 +169,7 @@ public class DragController implements DragDriver.EventListener, TouchController 
        final float scaleDps = mIsInPreDrag

                ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f;

        final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX,

                registrationY, initialDragViewScale, scaleDps);

                registrationY, initialDragViewScale, dragViewScaleOnDrop, scaleDps);

        dragView.setItemInfo(dragInfo);

        mDragObject.dragComplete = false;

        if (mOptions.isAccessibleDrag) {

src/com/android/launcher3/dragndrop/DragView.java

+4 −2
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class DragView extends View { 
    private final int mRegistrationX;

    private final int mRegistrationY;

    private final float mInitialScale;

    private final float mScaleOnDrop;

    private final int[] mTempLoc = new int[2];



    private Point mDragVisualizeOffset = null;
@@ -131,7 +132,7 @@ public class DragView extends View { 
     * @param registrationY The y coordinate of the registration point.

     */

    public DragView(Launcher launcher, Bitmap bitmap, int registrationX, int registrationY,

                    final float initialScale, final float finalScaleDps) {

                    final float initialScale, final float scaleOnDrop, final float finalScaleDps) {

        super(launcher);

        mLauncher = launcher;

        mDragLayer = launcher.getDragLayer();
@@ -180,6 +181,7 @@ public class DragView extends View { 
        mRegistrationY = registrationY;



        mInitialScale = initialScale;

        mScaleOnDrop = scaleOnDrop;



        // Force a measure, because Workspace uses getMeasuredHeight() before the layout pass

        int ms = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
@@ -596,7 +598,7 @@ public class DragView extends View { 
    public void animateTo(int toTouchX, int toTouchY, Runnable onCompleteRunnable, int duration) {

        mTempLoc[0] = toTouchX - mRegistrationX;

        mTempLoc[1] = toTouchY - mRegistrationY;

        mDragLayer.animateViewIntoPosition(this, mTempLoc, 1f, mInitialScale, mInitialScale,

        mDragLayer.animateViewIntoPosition(this, mTempLoc, 1f, mScaleOnDrop, mScaleOnDrop,

                DragLayer.ANIMATION_END_DISAPPEAR, onCompleteRunnable, duration);

    }

src/com/android/launcher3/widget/PendingItemDragHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class PendingItemDragHelper extends DragPreviewProvider { 


        // Start the drag

        launcher.getDragController().startDrag(preview, dragLayerX, dragLayerY, source, mAddInfo,

                dragOffset, dragRegion, scale, options);

                dragOffset, dragRegion, scale, scale, options);

    }



    @Override