commit 6a816b007c0eaa621e26291c97c616209cfac09a
author Jonathan Miranda <jonmiranda@google.com> Fri Oct 06 19:41:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 06 19:41:53 2017 +0000
tree 428e1f8c87d313237cd60166a7bf627dac9f879b
parent 846455e1ffdca9bac72b96ba61d2e42cd45cf4ce
parent f1eae802b5ba93fc6da537f6f4eca804c4de4f4b

Merge "Fix bug where labels were visible in hotseat / invisible in workspace." into ub-launcher3-dorval-polish2

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 3ebccda..a75c6d1 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -606,7 +606,7 @@
         // Hotseat icons - remove text
         if (child instanceof BubbleTextView) {
             BubbleTextView bubbleChild = (BubbleTextView) child;
-            bubbleChild.setTextVisibility(bubbleChild.shouldTextBeVisible());
+            bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
         }
 
         child.setScaleX(mChildScale);