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

Commit fc41a3a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-aba0a928-a4ff-4569-8ae5-9694c6816755' into ub-launcher3-dorval-polish2 

* changes:
  Polish Folder open animation during drag and drop. am: ecf45145
  Polish Folder open animation during drag and drop.
parents db8f3367 3c255ca1

src/com/android/launcher3/folder/FolderAnimationManager.java

+11 −10
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ public class FolderAnimationManager { 
        final Rect folderIconPos = new Rect();

        float scaleRelativeToDragLayer = mLauncher.getDragLayer()

                .getDescendantRectRelativeToSelf(mFolderIcon, folderIconPos);

        float initialSize = (mPreviewBackground.getRadius() * 2) * scaleRelativeToDragLayer;

        int scaledRadius = mPreviewBackground.getScaledRadius();

        float initialSize = (scaledRadius * 2) * scaleRelativeToDragLayer;



        // Match size/scale of icons in the preview

        float previewScale = rule.scaleForItem(0, itemsInPreview.size());
@@ -152,13 +153,9 @@ public class FolderAnimationManager { 
        final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop())

                * initialScale);



        // Background can have a scaled radius in drag and drop mode.

        int radiusDiff = mPreviewBackground.getScaledRadius()- mPreviewBackground.getRadius();



        int initialX = folderIconPos.left + mPreviewBackground.getOffsetX() - paddingOffsetX

                - previewItemOffsetX + radiusDiff;

        int initialY = folderIconPos.top + mPreviewBackground.getOffsetY() - paddingOffsetY

                + radiusDiff;

                - previewItemOffsetX;

        int initialY = folderIconPos.top + mPreviewBackground.getOffsetY() - paddingOffsetY;

        final float xDistance = initialX - lp.x;

        final float yDistance = initialY - lp.y;
@@ -232,7 +229,11 @@ public class FolderAnimationManager { 
            animator.setInterpolator(mFolderInterpolator);

        }



        addPreviewItemAnimators(a, initialScale / scaleRelativeToDragLayer, previewItemOffsetX);

        int radiusDiff = scaledRadius - mPreviewBackground.getRadius();

        addPreviewItemAnimators(a, initialScale / scaleRelativeToDragLayer,

                // Background can have a scaled radius in drag and drop mode, so we need to add the

                // difference to keep the preview items centered.

                previewItemOffsetX + radiusDiff, radiusDiff);

        return a;

    }
@@ -240,7 +241,7 @@ public class FolderAnimationManager { 
     * Animate the items on the current page.

     */

    private void addPreviewItemAnimators(AnimatorSet animatorSet, final float folderScale,

            int previewItemOffsetX) {

            int previewItemOffsetX, int previewItemOffsetY) {

        FolderIcon.PreviewLayoutRule rule = mFolderIcon.getLayoutRule();

        boolean isOnFirstPage = mFolder.mContent.getCurrentPage() == 0;

        final List<BubbleTextView> itemsInPreview = isOnFirstPage
@@ -281,7 +282,7 @@ public class FolderAnimationManager { 


            final int previewPosX =

                    (int) ((mTmpParams.transX - iconOffsetX + previewItemOffsetX) / folderScale);

            final int previewPosY = (int) (mTmpParams.transY / folderScale);

            final int previewPosY = (int) ((mTmpParams.transY + previewItemOffsetY) / folderScale);



            final float xDistance = previewPosX - btvLp.x;

            final float yDistance = previewPosY - btvLp.y;