Merge "Fix bug where pagination animation comes in from outside the folder when opening folder after swiping back home from another app (left to right swipe)" into tm-qpr-dev am: 922bde1df3

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

Change-Id: I808056e8bdd8c6a620454ec8269290765b8aee2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Federico Baron
2022-10-13 18:17:24 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -34,8 +34,7 @@
android:clipChildren="false"
android:orientation="horizontal"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:alpha="0">
android:paddingRight="12dp">
<com.android.launcher3.folder.FolderNameEditText
android:id="@+id/folder_name"

View File

@@ -215,6 +215,7 @@ public class FolderAnimationManager {
final int footerStartDelay;
if (isLargeFolder()) {
if (mIsOpening) {
mFolder.mFooter.setAlpha(0);
footerAlphaDuration = LARGE_FOLDER_FOOTER_DURATION;
footerStartDelay = mDuration - footerAlphaDuration;
} else {