summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/CustomizePagedView.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2010-10-02 16:01:03 -0700
committerMichael Jurka <mikejurka@google.com>2010-10-10 15:03:45 -0700
commit3e7c7634531302271270c8cf418abc959d621cbc (patch)
treef042105a58d77405faabe6667fd5f79b3415e3fb /src/com/android/launcher2/CustomizePagedView.java
parent5eb7fff487bf98cc6696f32274ce8ad2afee7a95 (diff)
downloadandroid_packages_apps_Trebuchet-3e7c7634531302271270c8cf418abc959d621cbc.tar.gz
android_packages_apps_Trebuchet-3e7c7634531302271270c8cf418abc959d621cbc.tar.bz2
android_packages_apps_Trebuchet-3e7c7634531302271270c8cf418abc959d621cbc.zip
updated Workspace thumbnail behavior
- in All Apps mode, fade thumbnails completely - while dragging, have thumbnails re-appear - while dragging, give screen thumbnails that can accept drops a different appearance (green outline instead of blue) Change-Id: I72ddf8a0f1947d35ef11514b7d4eea9ae5eee6e2
Diffstat (limited to 'src/com/android/launcher2/CustomizePagedView.java')
-rw-r--r--src/com/android/launcher2/CustomizePagedView.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index f3de74b36..93aa10965 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -321,7 +321,7 @@ public class CustomizePagedView extends PagedView
@Override
public void onDropCompleted(View target, boolean success) {
- // do nothing
+ mLauncher.getWorkspace().onDragStopped();
}
@Override
@@ -431,9 +431,11 @@ public class CustomizePagedView extends PagedView
Bitmap.Config.ARGB_8888);
Canvas c = new Canvas(b);
icon.draw(c);
+ PendingAddWidgetInfo createWidgetInfo = (PendingAddWidgetInfo) v.getTag();
- createItemInfo = (PendingAddItemInfo) v.getTag();
- mDragController.startDrag(v, b, this, createItemInfo, DragController.DRAG_ACTION_COPY,
+ mLauncher.getWorkspace().onDragStartedWithItemMinSize(
+ createWidgetInfo.minWidth, createWidgetInfo.minHeight);
+ mDragController.startDrag(v, b, this, createWidgetInfo, DragController.DRAG_ACTION_COPY,
null);
// Cleanup the icon
@@ -450,11 +452,13 @@ public class CustomizePagedView extends PagedView
mDragController.startDrag(
v, this, createItemInfo, DragController.DRAG_ACTION_COPY, null);
}
+ mLauncher.getWorkspace().onDragStartedWithItemSpans(1, 1);
return true;
case ShortcutCustomization:
createItemInfo = (PendingAddItemInfo) v.getTag();
mDragController.startDrag(
v, this, createItemInfo, DragController.DRAG_ACTION_COPY, null);
+ mLauncher.getWorkspace().onDragStartedWithItemSpans(1, 1);
return true;
case ApplicationCustomization:
// Pick up the application for dropping
@@ -462,6 +466,7 @@ public class CustomizePagedView extends PagedView
app = new ApplicationInfo(app);
mDragController.startDrag(v, this, app, DragController.DRAG_ACTION_COPY);
+ mLauncher.getWorkspace().onDragStartedWithItemSpans(1, 1);
return true;
}
return false;
@@ -613,9 +618,11 @@ public class CustomizePagedView extends PagedView
layout.removeAllViews();
for (int i = 0; i < count; ++i) {
AppWidgetProviderInfo info = (AppWidgetProviderInfo) list.get(i);
- PendingAddItemInfo createItemInfo = new PendingAddItemInfo();
+ PendingAddWidgetInfo createItemInfo = new PendingAddWidgetInfo();
createItemInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET;
createItemInfo.componentName = info.provider;
+ createItemInfo.minWidth = info.minWidth;
+ createItemInfo.minHeight = info.minHeight;
LinearLayout l = (LinearLayout) mInflater.inflate(
R.layout.customize_paged_view_widget, layout, false);