commit c51a2964fb9de56c6a8bb2875164c2992c676927
author Android Build Merger (Role) <android-build-merger@google.com> Thu Oct 05 21:23:57 2017 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> Thu Oct 05 21:23:57 2017 +0000
tree 62d46d08b792008281e57be6072f50de7f036d11
parent a9e345f886fe73435e727ef2ff286c2363c2a3c1
parent f1eae802b5ba93fc6da537f6f4eca804c4de4f4b

[automerger] Fix bug where labels were visible in hotseat / invisible in workspace. am: f1eae802b5

Change-Id: If4155798256c6b806f6f89ef441df6e0f49b4e39

src/com/android/launcher3/CellLayout.java

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