summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-07-18 03:47:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-18 03:47:44 +0000
commit751ea1c10e8e2348a9c0d0a22f8b9df3c9416c1f (patch)
tree7e382481f803797e56cfa90f14740836e872fdde /src/com/android/launcher3
parentb49ff69b91ae3a2c8b3d45ebdb07e1218b5f1f4a (diff)
parent19db4255a6c3316d4de3f0219219ddf86391bbc4 (diff)
downloadandroid_packages_apps_Trebuchet-751ea1c10e8e2348a9c0d0a22f8b9df3c9416c1f.tar.gz
android_packages_apps_Trebuchet-751ea1c10e8e2348a9c0d0a22f8b9df3c9416c1f.tar.bz2
android_packages_apps_Trebuchet-751ea1c10e8e2348a9c0d0a22f8b9df3c9416c1f.zip
Merge "Fix bug where Folder name stayed invisible." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3')
-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 622cd1096..459a58577 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -792,6 +792,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC
mFolderIcon.setVisibility(View.VISIBLE);
if (FeatureFlags.LAUNCHER3_NEW_FOLDER_ANIMATION) {
mFolderIcon.setBackgroundVisible(true);
+ mFolderIcon.mFolderName.setTextVisibility(true);
}
if (wasAnimated) {
if (FeatureFlags.LAUNCHER3_NEW_FOLDER_ANIMATION) {