Merge "Show and hide the wallpaper list in response to touch" into jb-ub-gel-agar
diff --git a/src/com/android/launcher3/AutoScrollHelper.java b/src/com/android/launcher3/AutoScrollHelper.java
index 9a7c3b0..3efd807 100644
--- a/src/com/android/launcher3/AutoScrollHelper.java
+++ b/src/com/android/launcher3/AutoScrollHelper.java
@@ -192,7 +192,7 @@
private static final float DEFAULT_RELATIVE_EDGE = 0.2f;
private static final float DEFAULT_RELATIVE_VELOCITY = 1f;
private static final int DEFAULT_ACTIVATION_DELAY = ViewConfiguration.getTapTimeout();
- private static final int DEFAULT_RAMP_UP_DURATION = 2500;
+ private static final int DEFAULT_RAMP_UP_DURATION = 500;
private static final int DEFAULT_RAMP_DOWN_DURATION = 500;
/**
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 09fad83..05d6dc4 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -145,11 +145,14 @@
item.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
return true;
}
- if (AppsCustomizePagedView.DISABLE_ALL_APPS &&
- item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
+ if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
item instanceof ShortcutInfo) {
- ShortcutInfo shortcutInfo = (ShortcutInfo) info;
- return (shortcutInfo.flags & AppInfo.DOWNLOADED_FLAG) != 0;
+ if (AppsCustomizePagedView.DISABLE_ALL_APPS) {
+ ShortcutInfo shortcutInfo = (ShortcutInfo) info;
+ return (shortcutInfo.flags & AppInfo.DOWNLOADED_FLAG) != 0;
+ } else {
+ return true;
+ }
}
}
return false;
diff --git a/src/com/android/launcher3/FolderAutoScrollHelper.java b/src/com/android/launcher3/FolderAutoScrollHelper.java
index d7e6770..68edc60 100644
--- a/src/com/android/launcher3/FolderAutoScrollHelper.java
+++ b/src/com/android/launcher3/FolderAutoScrollHelper.java
@@ -33,7 +33,7 @@
mTarget = target;
setActivationDelay(0);
- setEdgeType(EDGE_TYPE_INSIDE);
+ setEdgeType(EDGE_TYPE_INSIDE_EXTEND);
setExclusive(true);
setMaximumVelocity(MAX_SCROLL_VELOCITY, MAX_SCROLL_VELOCITY);
}
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index fc3925a..0ebeec3 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1725,7 +1725,7 @@
try {
intent = Intent.parseUri(intentDescription, 0);
ComponentName cn = intent.getComponent();
- if (!isValidPackageComponent(manager, cn)) {
+ if (cn != null && !isValidPackageComponent(manager, cn)) {
if (!mAppsCanBeOnRemoveableStorage) {
// Log the invalid package, and remove it from the db
Uri uri = LauncherSettings.Favorites.getContentUri(id,
@@ -2718,7 +2718,7 @@
Cursor c, int iconIndex, int titleIndex, HashMap<Object, CharSequence> labelCache) {
ComponentName componentName = intent.getComponent();
final ShortcutInfo info = new ShortcutInfo();
- if (!isValidPackageComponent(manager, componentName)) {
+ if (componentName != null && !isValidPackageComponent(manager, componentName)) {
Log.d(TAG, "Invalid package found in getShortcutInfo: " + componentName);
return null;
} else {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 01a8adf..9007b58 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3493,7 +3493,10 @@
if (success && !(beingCalledAfterUninstall && !mUninstallSuccessful)) {
if (target != this && mDragInfo != null) {
- getParentCellLayoutForView(mDragInfo.cell).removeView(mDragInfo.cell);
+ CellLayout parentCell = getParentCellLayoutForView(mDragInfo.cell);
+ if (parentCell != null) {
+ parentCell.removeView(mDragInfo.cell);
+ }
if (mDragInfo.cell instanceof DropTarget) {
mDragController.removeDropTarget((DropTarget) mDragInfo.cell);
}