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

Commit 825480fb authored by hyunyoungs's avatar hyunyoungs
Browse files

Icon should not disappear on drag and drop 

Bug: 275009677
Test: BubbleTextViewTest

Change-Id: Iddff7a0130c9a0ddb76223064338459dbe9b52e8
parent 1c0a27a2

src/com/android/launcher3/BubbleTextView.java

+5 −3
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ import com.android.launcher3.model.data.ItemInfo; 
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 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        mDotParams.scale = 0f;

        mForceHideDot = false;

        setBackground(null);

        setSingleLine(true);

        if (FeatureFlags.ENABLE_TWOLINE_ALLAPPS.get()

                || FeatureFlags.ENABLE_TWOLINE_DEVICESEARCH.get()) {

            setMaxLines(1);

        }



        setTag(null);

        if (mIconLoadRequest != null) {

tests/src/com/android/launcher3/ui/BubbleTextViewTest.java

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static androidx.test.core.app.ApplicationProvider.getApplicationContext; 
import static com.android.launcher3.config.FeatureFlags.ENABLE_TWOLINE_ALLAPPS;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;



import android.content.Context;

import android.graphics.Typeface;
@@ -79,7 +80,6 @@ public class BubbleTextViewTest { 
        mBubbleTextView = new BubbleTextView(mContext);

        mBubbleTextView.reset();

        mBubbleTextView.setDisplayAllApps();

        assertEquals(ONE_LINE, mBubbleTextView.getMaxLines());



        BubbleTextView testView = new BubbleTextView(mContext);

        testView.setTypeface(Typeface.MONOSPACE);
@@ -108,7 +108,7 @@ public class BubbleTextViewTest { 
            mBubbleTextView.setTypeface(Typeface.MONOSPACE);

            mBubbleTextView.measure(mLimitedWidth, 0);

            mBubbleTextView.onPreDraw();

            assertEquals(ONE_LINE, mBubbleTextView.getMaxLines());

            assertNotEquals(TWO_LINE, mBubbleTextView.getMaxLines());

        } catch (Exception e) {

            throw new RuntimeException(e);

        }