summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-05 21:23:57 +0000
committerAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-05 21:23:57 +0000
commitc51a2964fb9de56c6a8bb2875164c2992c676927 (patch)
tree62d46d08b792008281e57be6072f50de7f036d11 /src/com
parenta9e345f886fe73435e727ef2ff286c2363c2a3c1 (diff)
parentf1eae802b5ba93fc6da537f6f4eca804c4de4f4b (diff)
downloadpackages_apps_Trebuchet-c51a2964fb9de56c6a8bb2875164c2992c676927.tar.gz
packages_apps_Trebuchet-c51a2964fb9de56c6a8bb2875164c2992c676927.tar.bz2
packages_apps_Trebuchet-c51a2964fb9de56c6a8bb2875164c2992c676927.zip
[automerger] Fix bug where labels were visible in hotseat / invisible in workspace. am: f1eae802b5
Change-Id: If4155798256c6b806f6f89ef441df6e0f49b4e39
Diffstat (limited to 'src/com')
-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 d92b934d1..d6c8575d6 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -584,7 +584,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);