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

Commit 4f8fc565 authored by Fengjiang Li's avatar Fengjiang Li Committed by Automerger Merge Worker
Browse files

Merge "Clip folder chidren during folder open/close animation" into udc-dev... 

Merge "Clip folder chidren during folder open/close animation" into udc-dev am: a6400984 am: c4ab06d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23355102



Change-Id: I237fe3df960b3a279cfee416380dd7f87c65b636
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f2919d6 c4ab06d7

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

+5 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ public class FolderAnimationManager { 
        // {@link #onAnimationEnd} before B reads new UI state from {@link #onAnimationStart}.

        a.addListener(new AnimatorListenerAdapter() {

            private CellLayout mCellLayout;



            private boolean mFolderClipChildren;

            private boolean mFolderClipToPadding;

            private boolean mContentClipChildren;

            private boolean mContentClipToPadding;
@@ -283,12 +285,14 @@ public class FolderAnimationManager { 
            public void onAnimationStart(Animator animator) {

                super.onAnimationStart(animator);

                mCellLayout = mContent.getCurrentCellLayout();

                mFolderClipChildren = mFolder.getClipChildren();

                mFolderClipToPadding = mFolder.getClipToPadding();

                mContentClipChildren = mContent.getClipChildren();

                mContentClipToPadding = mContent.getClipToPadding();

                mCellLayoutClipChildren = mCellLayout.getClipChildren();

                mCellLayoutClipPadding = mCellLayout.getClipToPadding();



                mFolder.setClipChildren(false);

                mFolder.setClipToPadding(false);

                mContent.setClipChildren(false);

                mContent.setClipToPadding(false);
@@ -309,6 +313,7 @@ public class FolderAnimationManager { 
                mFolder.mFooter.setTranslationX(0f);

                mFolder.mFolderName.setAlpha(1f);



                mFolder.setClipChildren(mFolderClipChildren);

                mFolder.setClipToPadding(mFolderClipToPadding);

                mContent.setClipChildren(mContentClipChildren);

                mContent.setClipToPadding(mContentClipToPadding);