summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Miranda <jonmiranda@google.com>2017-10-06 19:41:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-06 19:41:53 +0000
commit6a816b007c0eaa621e26291c97c616209cfac09a (patch)
tree428e1f8c87d313237cd60166a7bf627dac9f879b
parent846455e1ffdca9bac72b96ba61d2e42cd45cf4ce (diff)
parentf1eae802b5ba93fc6da537f6f4eca804c4de4f4b (diff)
downloadandroid_packages_apps_Trebuchet-6a816b007c0eaa621e26291c97c616209cfac09a.zip
android_packages_apps_Trebuchet-6a816b007c0eaa621e26291c97c616209cfac09a.tar.gz
android_packages_apps_Trebuchet-6a816b007c0eaa621e26291c97c616209cfac09a.tar.bz2
Merge "Fix bug where labels were visible in hotseat / invisible in workspace." into ub-launcher3-dorval-polish2
-rw-r--r--src/com/android/launcher3/CellLayout.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
// Hotseat icons - remove text
if (child instanceof BubbleTextView) {
BubbleTextView bubbleChild = (BubbleTextView) child;
- bubbleChild.setTextVisibility(bubbleChild.shouldTextBeVisible());
+ bubbleChild.setTextVisibility(mContainerType != HOTSEAT);
}
child.setScaleX(mChildScale);