mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 01:16:49 +00:00
Merge "Clip folder chidren during folder open/close animation" into udc-dev am: a640098439
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23355102 Change-Id: Ie13ceb91ca3dafc53c11363238f03cb706b2c36f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user