Fixing issues in Launcher
- Now ending choice mode if a selected application is removed
- Only updating apps in the customization drawer if the applications change
- Adding null check when determining scrolling in PagedView
Change-Id: I0b23d1383649626dc012bd70a5e8087885b77c17
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index 5cfc38f..a475a50 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -144,7 +144,7 @@
Collections.sort(mApps, LauncherModel.APP_NAME_COMPARATOR);
// Update the widgets/shortcuts to reflect changes in the set of available apps
- update();
+ invalidatePageDataAndIconCache();
}
/**
@@ -170,7 +170,7 @@
addAppsWithoutInvalidate(list);
// Update the widgets/shortcuts to reflect changes in the set of available apps
- update();
+ invalidatePageDataAndIconCache();
}
/**
@@ -197,7 +197,7 @@
removeAppsWithoutInvalidate(list);
// Update the widgets/shortcuts to reflect changes in the set of available apps
- update();
+ invalidatePageDataAndIconCache();
}
/**
@@ -212,7 +212,7 @@
addAppsWithoutInvalidate(list);
// Update the widgets/shortcuts to reflect changes in the set of available apps
- update();
+ invalidatePageDataAndIconCache();
}
/**
@@ -231,8 +231,6 @@
}
public void update() {
- Context context = getContext();
-
// get the list of widgets
mWidgetList = AppWidgetManager.getInstance(mLauncher).getInstalledProviders();
Collections.sort(mWidgetList, new Comparator<AppWidgetProviderInfo>() {
@@ -260,7 +258,11 @@
mWallpaperList = mPackageManager.queryIntentActivities(wallpapersIntent, 0);
Collections.sort(mWallpaperList, resolveInfoComparator);
- // reset the icon cache
+ invalidatePageDataAndIconCache();
+ }
+
+ private void invalidatePageDataAndIconCache() {
+ // Reset the icon cache
mPageViewIconCache.clear();
// Refresh all the tabs