commit 50eef33f20c81d51b56a153ed3318c3329d637b1
author Brandon Dayauon <brdayauon@google.com> Tue Mar 14 20:18:54 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 14 20:18:54 2023 +0000
tree 3005619cfec21bcb3fc85ac86ca6cb6806116334
parent 105d72b6eaf7ef07a26fd8c507e642d5e5b691cf
parent 2b3343018e6cc6e509369c79e1f65aad4db62dc0

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

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 801b740..865edcd 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -665,8 +665,9 @@
                     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(),