PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing issue where we were not clearing the set of removed items since the last event. (Bug 6749258)

Browse Source 
Change-Id: I21ed2810e902e2727959b1a4cc0cd6183b750603
This commit is contained in:
Winson Chung
2012-07-16 20:45:03 -07:00
parent 4973aaf797
commit 5d55f33a1d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AppsCustomizePagedView.java
-3
View File
@@ -1736,7 +1736,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
ApplicationInfo info = list.get(i);
int removeIndex = findAppByComponent(mApps, info);
if (removeIndex > -1) {
Log.d(TAG, "Removing app in removeAppsWithoutInvalidate: " + info);
mApps.remove(removeIndex);
}
}
@@ -1746,8 +1745,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
for (String pn : packageNames) {
int removeIndex = findAppByPackage(mApps, pn);
while (removeIndex > -1) {
Log.d(TAG, "Removing app in removeAppsWithPackageNameWithoutInvalidate: "
+ mApps.get(removeIndex));
mApps.remove(removeIndex);
removeIndex = findAppByPackage(mApps, pn);
}
src/com/android/launcher2/LauncherModel.java
+10 -7
View File
@@ -1715,20 +1715,23 @@ public class LauncherModel extends BroadcastReceiver {
ArrayList<ApplicationInfo> modified = null;
if (mBgAllAppsList.added.size() > 0) {
added = mBgAllAppsList.added;
mBgAllAppsList.added = new ArrayList<ApplicationInfo>();
added = new ArrayList<ApplicationInfo>(mBgAllAppsList.added);
mBgAllAppsList.added.clear();
}
if (mBgAllAppsList.modified.size() > 0) {
modified = mBgAllAppsList.modified;
mBgAllAppsList.modified = new ArrayList<ApplicationInfo>();
modified = new ArrayList<ApplicationInfo>(mBgAllAppsList.modified);
mBgAllAppsList.modified.clear();
}
// We may be removing packages that have no associated launcher application, so we
// pass through the removed package names directly.
// NOTE: We flush the icon cache aggressively in removePackage() above.
final ArrayList<String> removedPackageNames = new ArrayList<String>();
for (int i = 0; i < N; ++i) {
removedPackageNames.add(packages[i]);
if (mBgAllAppsList.removed.size() > 0) {
mBgAllAppsList.removed.clear();
for (int i = 0; i < N; ++i) {
removedPackageNames.add(packages[i]);
}
}
final Callbacks callbacks = mCallbacks != null ? mCallbacks.get() : null;