diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-19 23:34:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-19 23:34:24 +0000 |
| commit | 60c26d142484f01e801d2205e4a05460d9b711de (patch) | |
| tree | 7772256f59cf375752fc8324f1fce0ca64192e07 /src/com/android/launcher3/folder/Folder.java | |
| parent | 092e856498ae3155ca969eca1087d9fedd2ef284 (diff) | |
| parent | e4a252a16b106ac74ae443d7567501cbd4f43813 (diff) | |
| download | android_packages_apps_Trebuchet-60c26d142484f01e801d2205e4a05460d9b711de.tar.gz android_packages_apps_Trebuchet-60c26d142484f01e801d2205e4a05460d9b711de.tar.bz2 android_packages_apps_Trebuchet-60c26d142484f01e801d2205e4a05460d9b711de.zip | |
Merge "Fade folder icon text when opening/closing." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/folder/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 5794004b9..fc25c9ab2 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -60,7 +60,6 @@ import com.android.launcher3.LauncherSettings; import com.android.launcher3.LogDecelerateInterpolator; import com.android.launcher3.OnAlarmListener; import com.android.launcher3.PagedView; -import com.android.launcher3.PendingAddItemInfo; import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.UninstallDropTarget.DropTargetSource; @@ -637,7 +636,9 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC @Override public void onAnimationStart(Animator animation) { if (FeatureFlags.LAUNCHER3_NEW_FOLDER_ANIMATION) { + mFolderIcon.setBackgroundVisible(false); mFolderIcon.drawLeaveBehindIfExists(); + } else { mFolderIcon.setVisibility(INVISIBLE); } @@ -790,6 +791,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC mDragController.removeDropTarget(this); clearFocus(); if (mFolderIcon != null) { + mFolderIcon.setBackgroundVisible(true); mFolderIcon.setVisibility(View.VISIBLE); if (wasAnimated) { mFolderIcon.mBackground.animateBackgroundStroke(); |