summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-26 22:01:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-26 22:01:08 +0000
commitf729eb529142b78aa03732a71f39e3a8c10d6188 (patch)
treee79264065705338a8ab2c080ef5cd5e822a6169f /src/com/android/launcher3/folder
parentbbe504d24d5e0757d1a7772af822b7a6e274c9b4 (diff)
parent1d9cc3247554d5b52534515af1a081716476097c (diff)
downloadandroid_packages_apps_Trebuchet-f729eb529142b78aa03732a71f39e3a8c10d6188.tar.gz
android_packages_apps_Trebuchet-f729eb529142b78aa03732a71f39e3a8c10d6188.tar.bz2
android_packages_apps_Trebuchet-f729eb529142b78aa03732a71f39e3a8c10d6188.zip
Merge "Fix Folder text animation bugs." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r--src/com/android/launcher3/folder/Folder.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index aad8123a9..3c7c69810 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -791,6 +791,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC
if (mFolderIcon != null) {
mFolderIcon.setVisibility(View.VISIBLE);
if (FeatureFlags.LAUNCHER3_NEW_FOLDER_ANIMATION) {
+ mFolderIcon.mFolderName.setTextVisibility(true);
mFolderIcon.setBackgroundVisible(true);
mFolderIcon.mBackground.fadeInBackgroundShadow();
}