mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-18 18:28:20 +00:00
Turn DragView into a FrameLayout
Bug: 183609936 Test: drag-n-drop icons, folders, widgets, shortcuts Change-Id: I030b36cd59ac6d0ced3263baca13108825ab2296
This commit is contained in:
@@ -1571,7 +1571,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
|
||||
scale * iconScale,
|
||||
scale,
|
||||
dragOptions);
|
||||
dv.setIntrinsicIconScaleFactor(dragOptions.intrinsicIconScaleFactor);
|
||||
return dv;
|
||||
}
|
||||
|
||||
@@ -2723,8 +2722,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
|
||||
info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
|
||||
if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external) && finalView != null) {
|
||||
Drawable crossFadeDrawable = createWidgetDrawable(info, finalView);
|
||||
dragView.setCrossFadeDrawable(crossFadeDrawable);
|
||||
dragView.crossFade((int) (duration * 0.8f));
|
||||
dragView.crossFadeContent(crossFadeDrawable, (int) (duration * 0.8f));
|
||||
} else if (isWidget && external) {
|
||||
scaleXY[0] = scaleXY[1] = Math.min(scaleXY[0], scaleXY[1]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user