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