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

Commit 50eef33f authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Shortcut/people icon horizontal layout polish" into tm-qpr-dev

parents 105d72b6 2b334301

src/com/android/launcher3/BubbleTextView.java

+3 −2
Original line number Diff line number Diff line
@@ -665,8 +665,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
                    getPaddingBottom());

        }

        // only apply two line for all_apps

        if (FeatureFlags.ENABLE_TWOLINE_ALLAPPS.get() && (mLastOriginalText != null)

                && (mDisplay == DISPLAY_ALL_APPS)) {

        if (((FeatureFlags.ENABLE_TWOLINE_ALLAPPS.get() && mDisplay == DISPLAY_ALL_APPS)

                || (FeatureFlags.ENABLE_TWOLINE_DEVICESEARCH.get()

                && mDisplay == DISPLAY_SEARCH_RESULT)) && (mLastOriginalText != null)) {

            CharSequence modifiedString = modifyTitleToSupportMultiLine(

                    MeasureSpec.getSize(widthMeasureSpec) - getCompoundPaddingLeft()

                            - getCompoundPaddingRight(),