Fixing drag to application info button in All Apps
Change-Id: I6f31bf3ac24366791cf84830584846d57aab9b80
diff --git a/src/com/android/launcher2/ApplicationInfoDropTarget.java b/src/com/android/launcher2/ApplicationInfoDropTarget.java
index c4aa98c..fe5ffd1 100644
--- a/src/com/android/launcher2/ApplicationInfoDropTarget.java
+++ b/src/com/android/launcher2/ApplicationInfoDropTarget.java
@@ -99,10 +99,11 @@
public void onDragStart(DragSource source, Object info, int dragAction) {
if (info != null) {
+ final int itemType = ((ItemInfo)info).itemType;
+ mActive = (itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION);
if (mManageVisibility) {
- mActive = true;
// Only show the info icon when an application is selected
- if (((ItemInfo)info).itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
+ if (mActive) {
setVisibility(VISIBLE);
}
mHandle.setVisibility(INVISIBLE);
@@ -128,10 +129,15 @@
public void getHitRect(Rect outRect) {
super.getHitRect(outRect);
if (LauncherApplication.isScreenXLarge()) {
- outRect.top -= 50;
- outRect.left -= 50;
- outRect.bottom += 50;
- outRect.right += 50;
+ // TODO: This is a temporary hack. mManageVisiblity = false when you're in CAB mode.
+ // In that case, this icon is more tightly spaced next to the delete icon so we want
+ // it to have a smaller drag region. When the new drag&drop system comes in, we'll
+ // dispatch the drag/drop by calculating what target you're overlapping
+ final int dragPadding = mManageVisibility ? 50 : 10;
+ outRect.top -= dragPadding;
+ outRect.left -= dragPadding;
+ outRect.bottom += dragPadding;
+ outRect.right += dragPadding;
}
}
diff --git a/src/com/android/launcher2/DeleteZone.java b/src/com/android/launcher2/DeleteZone.java
index e8f160f..4acde1c 100644
--- a/src/com/android/launcher2/DeleteZone.java
+++ b/src/com/android/launcher2/DeleteZone.java
@@ -206,10 +206,15 @@
public void getHitRect(Rect outRect) {
super.getHitRect(outRect);
if (LauncherApplication.isScreenXLarge()) {
- outRect.top -= 50;
- outRect.left -= 50;
- outRect.bottom += 50;
- outRect.right += 50;
+ // TODO: This is a temporary hack. mManageVisiblity = false when you're in CAB mode.
+ // In that case, this icon is more tightly spaced next to the delete icon so we want
+ // it to have a smaller drag region. When the new drag&drop system comes in, we'll
+ // dispatch the drag/drop by calculating what target you're overlapping
+ final int dragPadding = mManageVisibility ? 50 : 10;
+ outRect.top -= dragPadding;
+ outRect.left -= dragPadding;
+ outRect.bottom += dragPadding;
+ outRect.right += dragPadding;
}
}
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 9e66191..baec7e3 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1883,7 +1883,7 @@
}
/**
- * Opens the user fodler described by the specified tag. The opening of the folder
+ * Opens the user folder described by the specified tag. The opening of the folder
* is animated relative to the specified View. If the View is null, no animation
* is played.
*