From 2b3343018e6cc6e509369c79e1f65aad4db62dc0 Mon Sep 17 00:00:00 2001
From: Brandon Dayauon <brdayauon@google.com>
Date: Sun, 12 Mar 2023 18:46:29 -0700
Subject: [PATCH] Shortcut/people icon horizontal layout polish

- allow two line for SearchResultShortcutIcons (also be used in search_result_icon_container)

bug: 261047689
test: manual - https://screenshot.googleplex.com/9wwjxp3nqf4iyJr
Change-Id: Ie8d1415ea94f843f32abb9e4416064c1b674be6d
---
 src/com/android/launcher3/BubbleTextView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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