commit 606f54a1570252e46ce08818a16af93ef7a64b45
author Jon Miranda <jonmiranda@google.com> Thu Oct 12 00:21:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 00:21:32 2017 +0000
tree bf5158c45d848cb1429afe0936122d5ced9bcee4
parent 4c2a16c2dd1cc86d4ac77bad180d16b5e961a940
parent 2580bd67833a94f71d603631af288da681f71671

Merge branch 'ub-launcher3-dorval-polish2' am: ea6d0e631e
am: 2580bd6783

Change-Id: If8816b1381769b9a8e8690647548ceb7a301ccce

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);