diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-10-09 15:44:54 -0400 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-10-09 15:44:54 -0400 |
commit | ea6d0e631e0f8c607545c378dbd00142ca6a3b15 (patch) | |
tree | 428e1f8c87d313237cd60166a7bf627dac9f879b | |
parent | a328a0d83a1149b884dd49d302414d8080d28e40 (diff) | |
parent | 6a816b007c0eaa621e26291c97c616209cfac09a (diff) | |
download | android_packages_apps_Trebuchet-ea6d0e631e0f8c607545c378dbd00142ca6a3b15.tar.gz android_packages_apps_Trebuchet-ea6d0e631e0f8c607545c378dbd00142ca6a3b15.tar.bz2 android_packages_apps_Trebuchet-ea6d0e631e0f8c607545c378dbd00142ca6a3b15.zip |
Merge branch 'ub-launcher3-dorval-polish2'
Bug: 64937210
Test: flashed img
Change-Id: I62116a7e4d105eeeeae25a86cfb07d61586c4ab2
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 3ebccda9e..a75c6d1c4 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); |