Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271e219e authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

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: f1eae802
  Fix bug where labels were visible in hotseat / invisible in workspace.
parents 00c95b84 c51a2964

src/com/android/launcher3/CellLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -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);