Merge changes from topic "am-01ff3d34-0eea-44d5-99f7-af2df518afb2" into ub-launcher3-master
* changes:
[automerger] Fix bug where labels were visible in hotseat / invisible in workspace. am: f1eae802b5
Fix bug where labels were visible in hotseat / invisible in workspace.
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);