commit 922bde1df397795113a110fa7350c8ca89f13ecc
author Federico Baron <fbaron@google.com> Thu Oct 13 17:48:40 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 17:48:40 2022 +0000
tree dbf51a04440814aab9cd27e1063333083205e8a5
parent e9665371237240bfe0712515aa28a0721910ad70
parent c722e7d814ba39d0ad116c75510abb7334c30bdc

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

res/layout/user_folder_icon_normalized.xml

diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 4dee6e7..39f93d9 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -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"

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

diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 61ffd9d..5c47e04 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -215,6 +215,7 @@
         final int footerStartDelay;
         if (isLargeFolder()) {
             if (mIsOpening) {
+                mFolder.mFooter.setAlpha(0);
                 footerAlphaDuration = LARGE_FOLDER_FOOTER_DURATION;
                 footerStartDelay = mDuration - footerAlphaDuration;
             } else {