Merge "Updating PinShortcutRequestActivityInfo to provide pinRequest lazily" into tm-qpr-dev am: e1471d3acd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22318893

Change-Id: I38621d4470db873fd0b3b1b1b38047018cbcdec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sunny Goyal
2023-03-29 06:04:26 +00:00
committed by Automerger Merge Worker

View File

@@ -39,6 +39,8 @@ import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.pm.PinRequestHelper;
import com.android.launcher3.pm.ShortcutConfigActivityInfo;
import java.util.function.Supplier;
/**
* Extension of ShortcutConfigActivityInfo to be used in the confirmation prompt for pin item
* request.
@@ -50,15 +52,19 @@ public class PinShortcutRequestActivityInfo extends ShortcutConfigActivityInfo {
// actual existing class.
private static final String STUB_COMPONENT_CLASS = "pinned-shortcut";
private final PinItemRequest mRequest;
private final Supplier<PinItemRequest> mRequestSupplier;
private final ShortcutInfo mInfo;
private final Context mContext;
public PinShortcutRequestActivityInfo(PinItemRequest request, Context context) {
super(new ComponentName(request.getShortcutInfo().getPackage(), STUB_COMPONENT_CLASS),
request.getShortcutInfo().getUserHandle());
mRequest = request;
mInfo = request.getShortcutInfo();
this(request.getShortcutInfo(), () -> request, context);
}
public PinShortcutRequestActivityInfo(
ShortcutInfo si, Supplier<PinItemRequest> requestSupplier, Context context) {
super(new ComponentName(si.getPackage(), STUB_COMPONENT_CLASS), si.getUserHandle());
mRequestSupplier = requestSupplier;
mInfo = si;
mContext = context;
}
@@ -91,7 +97,7 @@ public class PinShortcutRequestActivityInfo extends ShortcutConfigActivityInfo {
true /* isToState */);
// Delay the actual accept() call until the drop animation is complete.
return PinRequestHelper.createWorkspaceItemFromPinItemRequest(
mContext, mRequest, duration);
mContext, mRequestSupplier.get(), duration);
}
@Override