Decoupling launcher/workspace package cleanup from the application list (Bug 6602756)
- Fixes issues where shortcuts created by wallpaper/widget-only apps are uninstalled.
Change-Id: I94c9d1d71fc34aa2fb7f0660534e616a82ac6f36
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 415ccac..1231558 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -116,7 +116,7 @@
*/
public final class Launcher extends Activity
implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks,
- AllAppsView.Watcher, View.OnTouchListener {
+ View.OnTouchListener {
static final String TAG = "Launcher";
static final boolean LOGD = false;
@@ -2261,13 +2261,6 @@
return mHotseat.isAllAppsButtonRank(rank);
}
- // AllAppsView.Watcher
- public void zoomed(float zoom) {
- if (zoom == 1.0f) {
- mWorkspace.setVisibility(View.GONE);
- }
- }
-
/**
* Helper method for the cameraZoomIn/cameraZoomOut animations
* @param view The view being animated
@@ -3481,17 +3474,17 @@
*
* Implementation of the method from LauncherModel.Callbacks.
*/
- public void bindAppsRemoved(ArrayList<ApplicationInfo> apps, boolean permanent) {
+ public void bindAppsRemoved(ArrayList<String> packageNames, boolean permanent) {
if (permanent) {
- mWorkspace.removeItems(apps);
+ mWorkspace.removeItems(packageNames);
}
if (mAppsCustomizeContent != null) {
- mAppsCustomizeContent.removeApps(apps);
+ mAppsCustomizeContent.removeApps(packageNames);
}
// Notify the drag controller
- mDragController.onAppsRemoved(apps, this);
+ mDragController.onAppsRemoved(packageNames, this);
}
/**