Updating the preview generation logic so that it aligns better with
the drag source image > Using common code for pending item drag (WidgetContainerView and PinItemDragListener) > Adding a shortcut-circuit in Workspace when a pendingItem can create a shortcut directly. Previously the multi-window drop was routing through onActivityResult which was causing some state information to be lost. Bug: 33584624 Change-Id: I0259870032185713caa9bff27092dbae6ce91199
This commit is contained in:
Sunny Goyal
@@ -0,0 +1,191 @@
|
||||
/*
|
||||
* Copyright (C) 2016 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.widget;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.Point;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.DragSource;
|
||||
import com.android.launcher3.Launcher;
|
||||
import com.android.launcher3.LauncherAppState;
|
||||
import com.android.launcher3.PendingAddItemInfo;
|
||||
import com.android.launcher3.Workspace;
|
||||
import com.android.launcher3.dragndrop.DragOptions;
|
||||
import com.android.launcher3.graphics.DragPreviewProvider;
|
||||
import com.android.launcher3.graphics.HolographicOutlineHelper;
|
||||
import com.android.launcher3.graphics.LauncherIcons;
|
||||
|
||||
/**
|
||||
* Extension of {@link DragPreviewProvider} with logic specific to pending widgets/shortcuts
|
||||
* dragged from the widget tray.
|
||||
*/
|
||||
public class PendingItemDragHelper extends DragPreviewProvider {
|
||||
|
||||
private static final float MAX_WIDGET_SCALE = 1.25f;
|
||||
|
||||
private final PendingAddItemInfo mAddInfo;
|
||||
|
||||
private Bitmap mPreviewBitmap;
|
||||
|
||||
public PendingItemDragHelper(View view) {
|
||||
super(view);
|
||||
mAddInfo = (PendingAddItemInfo) view.getTag();
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the drag for the pending item associated with the view.
|
||||
*
|
||||
* @param previewBounds The bounds where the image was displayed,
|
||||
* {@link WidgetImageView#getBitmapBounds()}
|
||||
* @param previewBitmapWidth The actual width of the bitmap displayed in the view.
|
||||
* @param previewViewWidth The width of {@link WidgetImageView} displaying the preview
|
||||
* @param screenPos Position of {@link WidgetImageView} on the screen
|
||||
*/
|
||||
public void startDrag(Rect previewBounds, int previewBitmapWidth, int previewViewWidth,
|
||||
Point screenPos, DragSource source, DragOptions options) {
|
||||
final Launcher launcher = Launcher.getLauncher(mView.getContext());
|
||||
LauncherAppState app = LauncherAppState.getInstance(launcher);
|
||||
|
||||
final Bitmap preview;
|
||||
final float scale;
|
||||
final Point dragOffset;
|
||||
final Rect dragRegion;
|
||||
|
||||
|
||||
if (mAddInfo instanceof PendingAddWidgetInfo) {
|
||||
PendingAddWidgetInfo createWidgetInfo = (PendingAddWidgetInfo) mAddInfo;
|
||||
int[] size = launcher.getWorkspace().estimateItemSize(createWidgetInfo, true, false);
|
||||
|
||||
int maxWidth = Math.min((int) (previewBitmapWidth * MAX_WIDGET_SCALE), size[0]);
|
||||
|
||||
int[] previewSizeBeforeScale = new int[1];
|
||||
preview = app.getWidgetCache() .generateWidgetPreview(
|
||||
launcher, createWidgetInfo.info, maxWidth, null, previewSizeBeforeScale);
|
||||
|
||||
if (previewSizeBeforeScale[0] < previewBitmapWidth) {
|
||||
// The icon has extra padding around it.
|
||||
int padding = (previewBitmapWidth - previewSizeBeforeScale[0]) / 2;
|
||||
if (previewBitmapWidth > previewViewWidth) {
|
||||
padding = padding * previewViewWidth / previewBitmapWidth;
|
||||
}
|
||||
|
||||
previewBounds.left += padding;
|
||||
previewBounds.right -= padding;
|
||||
}
|
||||
scale = previewBounds.width() / (float) preview.getWidth();
|
||||
launcher.getDragController().addDragListener(new WidgetHostViewLoader(launcher, mView));
|
||||
|
||||
dragOffset = null;
|
||||
dragRegion = null;
|
||||
} else {
|
||||
PendingAddShortcutInfo createShortcutInfo = (PendingAddShortcutInfo) mAddInfo;
|
||||
Drawable icon = createShortcutInfo.activityInfo.getFullResIcon(app.getIconCache());
|
||||
preview = LauncherIcons.createScaledBitmapWithoutShadow(icon, launcher);
|
||||
mAddInfo.spanX = mAddInfo.spanY = 1;
|
||||
scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getWidth();
|
||||
|
||||
dragOffset = new Point(previewPadding / 2, previewPadding / 2);
|
||||
|
||||
// Create a preview same as the workspace cell size and draw the icon at the
|
||||
// appropriate position.
|
||||
int[] size = launcher.getWorkspace().estimateItemSize(mAddInfo, false, true);
|
||||
DeviceProfile dp = launcher.getDeviceProfile();
|
||||
int iconSize = dp.iconSizePx;
|
||||
|
||||
dragRegion = new Rect();
|
||||
dragRegion.left = (size[0] - iconSize) / 2;
|
||||
dragRegion.right = dragRegion.left + iconSize;
|
||||
dragRegion.top = (size[1] - iconSize - dp.iconTextSizePx - dp.iconDrawablePaddingPx) / 2;
|
||||
dragRegion.bottom = dragRegion.top + iconSize;
|
||||
}
|
||||
|
||||
// Since we are not going through the workspace for starting the drag, set drag related
|
||||
// information on the workspace before starting the drag.
|
||||
launcher.getWorkspace().prepareDragWithProvider(this);
|
||||
|
||||
int dragLayerX = screenPos.x + previewBounds.left
|
||||
+ (int) ((scale * preview.getWidth() - preview.getWidth()) / 2);
|
||||
int dragLayerY = screenPos.y + previewBounds.top
|
||||
+ (int) ((scale * preview.getHeight() - preview.getHeight()) / 2);
|
||||
|
||||
mPreviewBitmap = preview;
|
||||
// Start the drag
|
||||
launcher.getDragController().startDrag(preview, dragLayerX, dragLayerY, source, mAddInfo,
|
||||
dragOffset, dragRegion, scale, options);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Bitmap createDragOutline(Canvas canvas) {
|
||||
if (mAddInfo instanceof PendingAddShortcutInfo) {
|
||||
int width = mPreviewBitmap.getWidth();
|
||||
int height = mPreviewBitmap.getHeight();
|
||||
Bitmap b = Bitmap.createBitmap(width + blurSizeOutline, height + blurSizeOutline,
|
||||
Bitmap.Config.ALPHA_8);
|
||||
canvas.setBitmap(b);
|
||||
|
||||
Launcher launcher = Launcher.getLauncher(mView.getContext());
|
||||
int size = launcher.getDeviceProfile().iconSizePx;
|
||||
|
||||
Rect src = new Rect(0, 0, mPreviewBitmap.getWidth(), mPreviewBitmap.getHeight());
|
||||
Rect dst = new Rect(0, 0, size, size);
|
||||
dst.offset(blurSizeOutline / 2, blurSizeOutline / 2);
|
||||
canvas.drawBitmap(mPreviewBitmap, src, dst, new Paint(Paint.FILTER_BITMAP_FLAG));
|
||||
|
||||
HolographicOutlineHelper.getInstance(mView.getContext())
|
||||
.applyExpensiveOutlineWithBlur(b, canvas);
|
||||
|
||||
canvas.setBitmap(null);
|
||||
return b;
|
||||
}
|
||||
|
||||
Workspace workspace = Launcher.getLauncher(mView.getContext()).getWorkspace();
|
||||
int[] size = workspace.estimateItemSize(mAddInfo, false, false);
|
||||
|
||||
int w = size[0];
|
||||
int h = size[1];
|
||||
final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ALPHA_8);
|
||||
canvas.setBitmap(b);
|
||||
|
||||
Rect src = new Rect(0, 0, mPreviewBitmap.getWidth(), mPreviewBitmap.getHeight());
|
||||
float scaleFactor = Math.min((w - blurSizeOutline) / (float) mPreviewBitmap.getWidth(),
|
||||
(h - blurSizeOutline) / (float) mPreviewBitmap.getHeight());
|
||||
int scaledWidth = (int) (scaleFactor * mPreviewBitmap.getWidth());
|
||||
int scaledHeight = (int) (scaleFactor * mPreviewBitmap.getHeight());
|
||||
Rect dst = new Rect(0, 0, scaledWidth, scaledHeight);
|
||||
|
||||
// center the image
|
||||
dst.offset((w - scaledWidth) / 2, (h - scaledHeight) / 2);
|
||||
|
||||
canvas.drawBitmap(mPreviewBitmap, src, dst, null);
|
||||
|
||||
// Don't clip alpha values for the drag outline if we're using the default widget preview
|
||||
boolean clipAlpha = !(mAddInfo instanceof PendingAddWidgetInfo &&
|
||||
(((PendingAddWidgetInfo) mAddInfo).previewImage == 0));
|
||||
HolographicOutlineHelper.getInstance(mView.getContext())
|
||||
.applyExpensiveOutlineWithBlur(b, canvas, clipAlpha);
|
||||
canvas.setBitmap(null);
|
||||
|
||||
return b;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user