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

Commit e3d74b49 authored by Pat Manning's avatar Pat Manning
Browse files

Hide both drop target icons if either text goes to two lines. 

Fix: 235088140
Test: manual
Change-Id: I582b8b771d859402b932193251690e5a4ffecbae
parent d3a7d37a

src/com/android/launcher3/DropTargetBar.java

+4 −1
Original line number Diff line number Diff line
@@ -194,9 +194,10 @@ public class DropTargetBar extends FrameLayout 
            int widthSpec = MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST);

            firstButton.measure(widthSpec, heightSpec);

            if (!mIsVertical) {

                // Remove icons and put the button's text on two lines if text is truncated.

                // Remove both icons and put the button's text on two lines if text is truncated.

                if (firstButton.isTextTruncated(availableWidth)) {

                    firstButton.setIconVisible(false);

                    secondButton.setIconVisible(false);

                    firstButton.setTextMultiLine(true);

                    firstButton.setPadding(horizontalPadding, verticalPadding / 2,

                            horizontalPadding, verticalPadding / 2);
@@ -209,8 +210,10 @@ public class DropTargetBar extends FrameLayout 
            }

            secondButton.measure(widthSpec, heightSpec);

            if (!mIsVertical) {

                // Remove both icons and put the button's text on two lines if text is truncated.

                if (secondButton.isTextTruncated(availableWidth)) {

                    secondButton.setIconVisible(false);

                    firstButton.setIconVisible(false);

                    secondButton.setTextMultiLine(true);

                    secondButton.setPadding(horizontalPadding, verticalPadding / 2,

                            horizontalPadding, verticalPadding / 2);