commit 825480fbccdb3f5b2d49930ddfc894d8815c6c31
author hyunyoungs <hyunyoungs@google.com> Fri Mar 24 10:11:15 2023 -0700
committer hyunyoungs <hyunyoungs@google.com> Fri Mar 24 15:16:20 2023 -0700
tree ba7c491e6b5252a02659b4f201ddd0cfa81e718e
parent 1c0a27a28e06f31e1450693fb59fe244583a63e7

Icon should not disappear on drag and drop

Bug: 275009677
Test: BubbleTextViewTest

Change-Id: Iddff7a0130c9a0ddb76223064338459dbe9b52e8

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index ea79c55..db5eb1e 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -72,9 +72,9 @@
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.popup.PopupContainerWithArrow;
-import com.android.launcher3.util.MultiTranslateDelegate;
 import com.android.launcher3.search.StringMatcherUtility;
 import com.android.launcher3.util.IntArray;
+import com.android.launcher3.util.MultiTranslateDelegate;
 import com.android.launcher3.util.SafeCloseable;
 import com.android.launcher3.util.ShortcutUtil;
 import com.android.launcher3.views.ActivityContext;
@@ -269,8 +269,10 @@
         mDotParams.scale = 0f;
         mForceHideDot = false;
         setBackground(null);
-        setSingleLine(true);
-        setMaxLines(1);
+        if (FeatureFlags.ENABLE_TWOLINE_ALLAPPS.get()
+                || FeatureFlags.ENABLE_TWOLINE_DEVICESEARCH.get()) {
+            setMaxLines(1);
+        }
 
         setTag(null);
         if (mIconLoadRequest != null) {