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

Commit 41253866 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "When shortcuts close, only set text visible if not in hotseat." into... 

Merge "When shortcuts close, only set text visible if not in hotseat." into ub-launcher3-calgary-polish
parents 6a7ca92f 12624a5a

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

+4 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.launcher3.Launcher; 
import com.android.launcher3.LauncherAnimUtils;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherModel;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.LauncherViewPropertyAnimator;

import com.android.launcher3.R;

import com.android.launcher3.ShortcutInfo;
@@ -687,7 +688,9 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC 
        mDeferContainerRemoval = false;

        // Make the original icon visible in All Apps, but not in Workspace or Folders.

        cleanupDeferredDrag(mDeferredDragIcon.getTag() instanceof AppInfo);

        mDeferredDragIcon.setTextVisibility(true);

        boolean isInHotseat = ((ItemInfo) mDeferredDragIcon.getTag()).container

                == LauncherSettings.Favorites.CONTAINER_HOTSEAT;

        mDeferredDragIcon.setTextVisibility(!isInHotseat);

        mLauncher.getDragController().removeDragListener(this);

        mLauncher.getDragLayer().removeView(this);

    }