summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-12 07:22:51 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-12 07:22:51 (GMT)
commit51722a312d590cd591ae53a87dcf13c113e8407d (patch)
tree428e1f8c87d313237cd60166a7bf627dac9f879b
parent31bc3da013475316f7d0c6ac3bcdb5df013b12fe (diff)
parentea6d0e631e0f8c607545c378dbd00142ca6a3b15 (diff)
downloadandroid_packages_apps_Trebuchet-51722a312d590cd591ae53a87dcf13c113e8407d.zip
android_packages_apps_Trebuchet-51722a312d590cd591ae53a87dcf13c113e8407d.tar.gz
android_packages_apps_Trebuchet-51722a312d590cd591ae53a87dcf13c113e8407d.tar.bz2
Snap for 4391495 from ea6d0e631e0f8c607545c378dbd00142ca6a3b15 to oc-mr1-release
Change-Id: I0a569c26a8a11e55e49103ef07ce3437dde6be86
-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);