diff options
Diffstat (limited to 'src/com/android/launcher3/folder')
4 files changed, 45 insertions, 45 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 2ce663433..4dbff1c61 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -61,7 +61,7 @@ import com.android.launcher3.LauncherSettings; import com.android.launcher3.OnAlarmListener; import com.android.launcher3.PagedView; import com.android.launcher3.R; -import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.accessibility.AccessibleDragListenerAdapter; import com.android.launcher3.config.FeatureFlags; @@ -236,8 +236,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo public boolean startDrag(View v, DragOptions options) { Object tag = v.getTag(); - if (tag instanceof ShortcutInfo) { - ShortcutInfo item = (ShortcutInfo) tag; + if (tag instanceof WorkspaceItemInfo) { + WorkspaceItemInfo item = (WorkspaceItemInfo) tag; mEmptyCellRank = item.rank; mCurrentDragView = v; @@ -269,13 +269,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo } mContent.removeItem(mCurrentDragView); - if (dragObject.dragInfo instanceof ShortcutInfo) { + if (dragObject.dragInfo instanceof WorkspaceItemInfo) { mItemsInvalidated = true; // We do not want to get events for the item being removed, as they will get handled // when the drop completes try (SuppressInfoChanges s = new SuppressInfoChanges()) { - mInfo.remove((ShortcutInfo) dragObject.dragInfo, true); + mInfo.remove((WorkspaceItemInfo) dragObject.dragInfo, true); } } mDragInProgress = true; @@ -379,7 +379,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo void bind(FolderInfo info) { mInfo = info; - ArrayList<ShortcutInfo> children = info.contents; + ArrayList<WorkspaceItemInfo> children = info.contents; Collections.sort(children, ITEM_POS_COMPARATOR); mContent.bindItems(children); @@ -800,7 +800,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo } } else { // The drag failed, we need to return the item to the folder - ShortcutInfo info = (ShortcutInfo) d.dragInfo; + WorkspaceItemInfo info = (WorkspaceItemInfo) d.dragInfo; View icon = (mCurrentDragView != null && mCurrentDragView.getTag() == info) ? mCurrentDragView : mContent.createNewView(info); ArrayList<View> views = getItemsInReadingOrder(); @@ -1023,7 +1023,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo // folder CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screenId); - ShortcutInfo finalItem = mInfo.contents.remove(0); + WorkspaceItemInfo finalItem = mInfo.contents.remove(0); newIcon = mLauncher.createShortcut(cellLayout, finalItem); mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem, mInfo.container, mInfo.screenId, mInfo.cellX, mInfo.cellY); @@ -1111,9 +1111,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo PendingAddShortcutInfo pasi = d.dragInfo instanceof PendingAddShortcutInfo ? (PendingAddShortcutInfo) d.dragInfo : null; - ShortcutInfo pasiSi = pasi != null ? pasi.activityInfo.createShortcutInfo() : null; + WorkspaceItemInfo pasiSi = pasi != null ? pasi.activityInfo.createWorkspaceItemInfo() : null; if (pasi != null && pasiSi == null) { - // There is no ShortcutInfo, so we have to go through a configuration activity. + // There is no WorkspaceItemInfo, so we have to go through a configuration activity. pasi.container = mInfo.id; pasi.rank = mEmptyCellRank; @@ -1122,15 +1122,15 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo d.deferDragViewCleanupPostAnimation = false; mRearrangeOnClose = true; } else { - final ShortcutInfo si; + final WorkspaceItemInfo si; if (pasiSi != null) { si = pasiSi; } else if (d.dragInfo instanceof AppInfo) { // Came from all apps -- make a copy. - si = ((AppInfo) d.dragInfo).makeShortcut(); + si = ((AppInfo) d.dragInfo).makeWorkspaceItem(); } else { - // ShortcutInfo - si = (ShortcutInfo) d.dragInfo; + // WorkspaceItemInfo + si = (WorkspaceItemInfo) d.dragInfo; } View currentDragView; @@ -1138,7 +1138,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo currentDragView = mContent.createAndAddViewForRank(si, mEmptyCellRank); // Actually move the item in the database if it was an external drag. Call this - // before creating the view, so that ShortcutInfo is updated appropriately. + // before creating the view, so that WorkspaceItemInfo is updated appropriately. mLauncher.getModelWriter().addOrMoveItemInDatabase( si, mInfo.id, 0, si.cellX, si.cellY); @@ -1194,17 +1194,17 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo // This is used so the item doesn't immediately appear in the folder when added. In one case // we need to create the illusion that the item isn't added back to the folder yet, to // to correspond to the animation of the icon back into the folder. This is - public void hideItem(ShortcutInfo info) { + public void hideItem(WorkspaceItemInfo info) { View v = getViewForInfo(info); v.setVisibility(INVISIBLE); } - public void showItem(ShortcutInfo info) { + public void showItem(WorkspaceItemInfo info) { View v = getViewForInfo(info); v.setVisibility(VISIBLE); } @Override - public void onAdd(ShortcutInfo item, int rank) { + public void onAdd(WorkspaceItemInfo item, int rank) { View view = mContent.createAndAddViewForRank(item, rank); mLauncher.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX, item.cellY); @@ -1215,7 +1215,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mItemsInvalidated = true; } - public void onRemove(ShortcutInfo item) { + public void onRemove(WorkspaceItemInfo item) { mItemsInvalidated = true; View v = getViewForInfo(item); mContent.removeItem(v); @@ -1233,7 +1233,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo } } - private View getViewForInfo(final ShortcutInfo item) { + private View getViewForInfo(final WorkspaceItemInfo item) { return mContent.iterateOverItems(new ItemOperator() { @Override diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index bcd5701b5..02242a3ec 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -50,7 +50,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherSettings; import com.android.launcher3.OnAlarmListener; import com.android.launcher3.R; -import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.SimpleOnStylusPressListener; import com.android.launcher3.StylusEventHelper; import com.android.launcher3.Utilities; @@ -226,15 +226,15 @@ public class FolderIcon extends FrameLayout implements FolderListener { return !mFolder.isDestroyed() && willAcceptItem(dragInfo); } - public void addItem(ShortcutInfo item) { + public void addItem(WorkspaceItemInfo item) { addItem(item, true); } - public void addItem(ShortcutInfo item, boolean animate) { + public void addItem(WorkspaceItemInfo item, boolean animate) { mInfo.add(item, animate); } - public void removeItem(ShortcutInfo item, boolean animate) { + public void removeItem(WorkspaceItemInfo item, boolean animate) { mInfo.remove(item, animate); } @@ -247,7 +247,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { mOpenAlarm.setOnAlarmListener(mOnOpenListener); if (SPRING_LOADING_ENABLED && ((dragInfo instanceof AppInfo) - || (dragInfo instanceof ShortcutInfo) + || (dragInfo instanceof WorkspaceItemInfo) || (dragInfo instanceof PendingAddShortcutInfo))) { mOpenAlarm.setAlarm(ON_OPEN_DELAY); } @@ -264,8 +264,8 @@ public class FolderIcon extends FrameLayout implements FolderListener { return mPreviewItemManager.prepareCreateAnimation(destView); } - public void performCreateAnimation(final ShortcutInfo destInfo, final View destView, - final ShortcutInfo srcInfo, final DragView srcView, Rect dstRect, + public void performCreateAnimation(final WorkspaceItemInfo destInfo, final View destView, + final WorkspaceItemInfo srcInfo, final DragView srcView, Rect dstRect, float scaleRelativeToDragLayer) { prepareCreateAnimation(destView); addItem(destInfo); @@ -290,7 +290,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { mOpenAlarm.cancelAlarm(); } - private void onDrop(final ShortcutInfo item, DragView animateView, Rect finalRect, + private void onDrop(final WorkspaceItemInfo item, DragView animateView, Rect finalRect, float scaleRelativeToDragLayer, int index, boolean itemReturnedOnFailedDrop) { item.cellX = -1; @@ -382,15 +382,15 @@ public class FolderIcon extends FrameLayout implements FolderListener { } public void onDrop(DragObject d, boolean itemReturnedOnFailedDrop) { - ShortcutInfo item; + WorkspaceItemInfo item; if (d.dragInfo instanceof AppInfo) { // Came from all apps -- make a copy - item = ((AppInfo) d.dragInfo).makeShortcut(); + item = ((AppInfo) d.dragInfo).makeWorkspaceItem(); } else if (d.dragSource instanceof BaseItemDragListener){ // Came from a different window -- make a copy - item = new ShortcutInfo((ShortcutInfo) d.dragInfo); + item = new WorkspaceItemInfo((WorkspaceItemInfo) d.dragInfo); } else { - item = (ShortcutInfo) d.dragInfo; + item = (WorkspaceItemInfo) d.dragInfo; } mFolder.notifyDrop(); onDrop(item, d.dragView, null, 1.0f, mInfo.contents.size(), @@ -581,7 +581,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { } @Override - public void onAdd(ShortcutInfo item, int rank) { + public void onAdd(WorkspaceItemInfo item, int rank) { boolean wasDotted = mDotInfo.hasDot(); mDotInfo.addDotInfo(mLauncher.getDotInfoForItem(item)); boolean isDotted = mDotInfo.hasDot(); @@ -591,7 +591,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { } @Override - public void onRemove(ShortcutInfo item) { + public void onRemove(WorkspaceItemInfo item) { boolean wasDotted = mDotInfo.hasDot(); mDotInfo.subtractDotInfo(mLauncher.getDotInfoForItem(item)); boolean isDotted = mDotInfo.hasDot(); diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index d4ce6dd23..57105e7ca 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -38,7 +38,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.PagedView; import com.android.launcher3.R; import com.android.launcher3.ShortcutAndWidgetContainer; -import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.anim.Interpolators; @@ -178,9 +178,9 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { /** * Binds items to the layout. */ - public void bindItems(ArrayList<ShortcutInfo> items) { + public void bindItems(ArrayList<WorkspaceItemInfo> items) { ArrayList<View> icons = new ArrayList<>(); - for (ShortcutInfo item : items) { + for (WorkspaceItemInfo item : items) { icons.add(createNewView(item)); } arrangeChildren(icons, icons.size(), false); @@ -203,7 +203,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { return rank; } - public View createAndAddViewForRank(ShortcutInfo item, int rank) { + public View createAndAddViewForRank(WorkspaceItemInfo item, int rank) { View icon = createNewView(item); allocateSpaceForRank(rank); addViewForRank(icon, item, rank); @@ -214,7 +214,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { * Adds the {@param view} to the layout based on {@param rank} and updated the position * related attributes. It assumes that {@param item} is already attached to the view. */ - public void addViewForRank(View view, ShortcutInfo item, int rank) { + public void addViewForRank(View view, WorkspaceItemInfo item, int rank) { int pagePos = rank % mMaxItemsPerPage; int pageNo = rank / mMaxItemsPerPage; @@ -229,10 +229,10 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { } @SuppressLint("InflateParams") - public View createNewView(ShortcutInfo item) { + public View createNewView(WorkspaceItemInfo item) { final BubbleTextView textView = (BubbleTextView) mInflater.inflate( R.layout.folder_application, null, false); - textView.applyFromShortcutInfo(item); + textView.applyFromWorkspaceItem(item); textView.setHapticFeedbackEnabled(false); textView.setOnClickListener(ItemClickHandler.INSTANCE); textView.setOnLongClickListener(mFolder); @@ -631,7 +631,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { if (v != null) { if (pageToAnimate != p) { page.removeView(v); - addViewForRank(v, (ShortcutInfo) v.getTag(), moveStart); + addViewForRank(v, (WorkspaceItemInfo) v.getTag(), moveStart); } else { // Do a fake animation before removing it. final int newRank = moveStart; @@ -644,7 +644,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { mPendingAnimations.remove(v); v.setTranslationX(oldTranslateX); ((CellLayout) v.getParent().getParent()).removeView(v); - addViewForRank(v, (ShortcutInfo) v.getTag(), newRank); + addViewForRank(v, (WorkspaceItemInfo) v.getTag(), newRank); } }; v.animate() diff --git a/src/com/android/launcher3/folder/PreviewItemManager.java b/src/com/android/launcher3/folder/PreviewItemManager.java index af98680ea..49763ba9d 100644 --- a/src/com/android/launcher3/folder/PreviewItemManager.java +++ b/src/com/android/launcher3/folder/PreviewItemManager.java @@ -31,7 +31,7 @@ import android.view.View; import android.widget.TextView; import com.android.launcher3.BubbleTextView; -import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.WorkspaceItemInfo; import com.android.launcher3.Utilities; import java.util.ArrayList; @@ -301,7 +301,7 @@ public class PreviewItemManager { * @param dropped The item that was dropped onto the FolderIcon. */ public void onDrop(List<BubbleTextView> oldParams, List<BubbleTextView> newParams, - ShortcutInfo dropped) { + WorkspaceItemInfo dropped) { int numItems = newParams.size(); final ArrayList<PreviewItemDrawingParams> params = mFirstPageParams; buildParamsForPage(0, params, false); |