am 3705bb1b: Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit

* commit '3705bb1b794ecb660e1ac57c4a3e99909d71a05e':
  Add support for initiating a drag from an overlay.
This commit is contained in:
Mathew Inwood
2014-02-14 20:38:06 +00:00
committed by Android Git Automerger
4 changed files with 31 additions and 4 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ import java.io.IOException;
/**
* Represents an item in the launcher.
*/
class ItemInfo {
public class ItemInfo {
static final int NO_ID = -1;
+20
View File
@@ -45,6 +45,7 @@ import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.ContentObserver;
@@ -4502,6 +4503,25 @@ public class Launcher extends Activity
DISMISS_CLING_DURATION, true);
}
public ItemInfo createAppDragInfo(Intent appLaunchIntent) {
ResolveInfo ri = getPackageManager().resolveActivity(appLaunchIntent, 0);
if (ri == null) {
return null;
}
return new AppInfo(getPackageManager(), ri, mIconCache, null);
}
public ItemInfo createShortcutDragInfo(Intent shortcutIntent, CharSequence caption,
Bitmap icon) {
return new ShortcutInfo(shortcutIntent, caption, icon);
}
public void startDrag(View dragView, ItemInfo dragInfo, DragSource source) {
dragView.setTag(dragInfo);
mWorkspace.onDragStartedWithItem(dragView);
mWorkspace.beginDragShared(dragView, source);
}
/**
* Prints out out state for debugging.
*/
+8 -1
View File
@@ -71,7 +71,14 @@ class ShortcutInfo extends ItemInfo {
protected Intent getIntent() {
return intent;
}
ShortcutInfo(Intent intent, CharSequence title, Bitmap icon) {
this();
this.intent = intent;
this.title = title;
mIcon = icon;
}
public ShortcutInfo(Context context, ShortcutInfo info) {
super(info);
title = info.title.toString();
+2 -2
View File
@@ -43,7 +43,7 @@ import java.util.ArrayList;
/**
* Various utilities shared amongst the Launcher's classes.
*/
final class Utilities {
public final class Utilities {
private static final String TAG = "Launcher.Utilities";
private static int sIconWidth = -1;
@@ -111,7 +111,7 @@ final class Utilities {
/**
* Returns a bitmap suitable for the all apps view.
*/
static Bitmap createIconBitmap(Drawable icon, Context context) {
public static Bitmap createIconBitmap(Drawable icon, Context context) {
synchronized (sCanvas) { // we share the statics :-(
if (sIconWidth == -1) {
initStatics(context);