70864289fb
This change adds nearby-area searching when dragging desktop items into already-occupied cells. This approach tries harder to find a matching area, instead of strictly rejecting invalid moves. We also draw a "snag" during the drag to show where an item would be dropped, but only if we would drop into an alternative cell. This gives users better feedback about where things will drop. http://b/issue?id=1634887
98 lines
3.6 KiB
Java
98 lines
3.6 KiB
Java
/*
|
|
* Copyright (C) 2008 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.launcher;
|
|
|
|
import android.content.Context;
|
|
import android.content.res.Resources;
|
|
import android.graphics.Rect;
|
|
import android.graphics.drawable.Drawable;
|
|
import android.util.AttributeSet;
|
|
import android.view.LayoutInflater;
|
|
import android.view.ViewGroup;
|
|
|
|
/**
|
|
* An icon that can appear on in the workspace representing an {@link UserFolder}.
|
|
*/
|
|
public class FolderIcon extends BubbleTextView implements DropTarget {
|
|
private UserFolderInfo mInfo;
|
|
private Launcher mLauncher;
|
|
private Drawable mCloseIcon;
|
|
private Drawable mOpenIcon;
|
|
|
|
public FolderIcon(Context context, AttributeSet attrs) {
|
|
super(context, attrs);
|
|
}
|
|
|
|
public FolderIcon(Context context) {
|
|
super(context);
|
|
}
|
|
|
|
static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group,
|
|
UserFolderInfo folderInfo) {
|
|
|
|
FolderIcon icon = (FolderIcon) LayoutInflater.from(launcher).inflate(resId, group, false);
|
|
|
|
final Resources resources = launcher.getResources();
|
|
Drawable d = resources.getDrawable(R.drawable.ic_launcher_folder);
|
|
d = Utilities.createIconThumbnail(d, launcher);
|
|
icon.mCloseIcon = d;
|
|
icon.mOpenIcon = resources.getDrawable(R.drawable.ic_launcher_folder_open);
|
|
icon.setCompoundDrawablesWithIntrinsicBounds(null, d, null, null);
|
|
icon.setText(folderInfo.title);
|
|
icon.setTag(folderInfo);
|
|
icon.setOnClickListener(launcher);
|
|
icon.mInfo = folderInfo;
|
|
icon.mLauncher = launcher;
|
|
|
|
return icon;
|
|
}
|
|
|
|
public boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset,
|
|
Object dragInfo) {
|
|
final ItemInfo item = (ItemInfo) dragInfo;
|
|
final int itemType = item.itemType;
|
|
return (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
|
|
itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT)
|
|
&& item.container != mInfo.id;
|
|
}
|
|
|
|
public Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset, Object dragInfo, Rect recycle) {
|
|
return null;
|
|
}
|
|
|
|
public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset, Object dragInfo) {
|
|
final ApplicationInfo item = (ApplicationInfo) dragInfo;
|
|
// TODO: update open folder that is looking at this data
|
|
mInfo.add(item);
|
|
LauncherModel.addOrMoveItemInDatabase(mLauncher, item, mInfo.id, 0, 0, 0);
|
|
}
|
|
|
|
public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset,
|
|
Object dragInfo) {
|
|
setCompoundDrawablesWithIntrinsicBounds(null, mOpenIcon, null, null);
|
|
}
|
|
|
|
public void onDragOver(DragSource source, int x, int y, int xOffset, int yOffset,
|
|
Object dragInfo) {
|
|
}
|
|
|
|
public void onDragExit(DragSource source, int x, int y, int xOffset, int yOffset,
|
|
Object dragInfo) {
|
|
setCompoundDrawablesWithIntrinsicBounds(null, mCloseIcon, null, null);
|
|
}
|
|
}
|