aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing duplicate/inconsistent definitions for model and callbacks

Browse Source 
> 2 implementations for filtering workspace items
> 2 implementations for binding widgets
> duplicate logic for add and update appInfo

Change-Id: Id68a49926af398478deca8ac85ab1f22341a9449
This commit is contained in:
Sunny Goyal
2017-08-17 07:45:25 -07:00
parent eeccd38368
commit b23980cc0e
11 changed files with 57 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/launcher3/model/PackageUpdatedTask.java
View File

@@ -147,51 +147,28 @@ public class PackageUpdatedTask extends BaseModelUpdateTask {
break;
}
ArrayList<AppInfo> added = null;
ArrayList<AppInfo> modified = null;
final ArrayList<AppInfo> removedApps = new ArrayList<>();
final ArrayList<AppInfo> addedOrModified = new ArrayList<>();
addedOrModified.addAll(appsList.added);
appsList.added.clear();
addedOrModified.addAll(appsList.modified);
appsList.modified.clear();
if (appsList.added.size() > 0) {
added = new ArrayList<>(appsList.added);
appsList.added.clear();
}
if (appsList.modified.size() > 0) {
modified = new ArrayList<>(appsList.modified);
appsList.modified.clear();
}
if (appsList.removed.size() > 0) {
removedApps.addAll(appsList.removed);
appsList.removed.clear();
}
final ArrayList<AppInfo> removedApps = new ArrayList<>(appsList.removed);
appsList.removed.clear();
final ArrayMap<ComponentName, AppInfo> addedOrUpdatedApps = new ArrayMap<>();
if (added != null) {
final ArrayList<AppInfo> addedApps = added;
if (!addedOrModified.isEmpty()) {
scheduleCallbackTask(new CallbackTask() {
@Override
public void execute(Callbacks callbacks) {
callbacks.bindAppsAdded(null, null, null, addedApps);
callbacks.bindAppsAddedOrUpdated(addedOrModified);
}
});
for (AppInfo ai : added) {
for (AppInfo ai : addedOrModified) {
addedOrUpdatedApps.put(ai.componentName, ai);
}
}
if (modified != null) {
final ArrayList<AppInfo> modifiedFinal = modified;
for (AppInfo ai : modified) {
addedOrUpdatedApps.put(ai.componentName, ai);
}
scheduleCallbackTask(new CallbackTask() {
@Override
public void execute(Callbacks callbacks) {
callbacks.bindAppsUpdated(modifiedFinal);
}
});
}
// Update shortcut infos
if (mOp == OP_ADD || flagOp != FlagOp.NO_OP) {
final ArrayList<ShortcutInfo> updatedShortcuts = new ArrayList<>();