openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Consider folder diff differently" into ub-launcher3-rvc-dev

This commit is contained in:
Tracy Zhou 2020-06-11 05:21:18 +00:00 committed by Android (Google) Code Review
parent bb58efabc8 fa88a25ea4
commit 3b18d41e2c
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/launcher3/model/GridSizeMigrationTaskV2.java
View File

@ -59,7 +59,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
/**
* This class takes care of shrinking the workspace (by maximum of one row and one column), as a
@ -248,12 +247,25 @@ public class GridSizeMigrationTaskV2 {
/** Return what's in the src but not in the dest */
private static List<DbEntry> calcDiff(List<DbEntry> src, List<DbEntry> dest) {
Set<String> destSet = dest.parallelStream().map(DbEntry::getIntentStr).collect(
Collectors.toSet());
Set<String> destIntentSet = new HashSet<>();
Set<Set<String>> destFolderIntentSet = new HashSet<>();
for (DbEntry entry : dest) {
if (entry.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
destFolderIntentSet.add(entry.mFolderItems.keySet());
} else {
destIntentSet.add(entry.mIntent);
}
}
List<DbEntry> diff = new ArrayList<>();
for (DbEntry entry : src) {
if (!destSet.contains(entry.mIntent)) {
diff.add(entry);
if (entry.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) {
if (!destFolderIntentSet.contains(entry.mFolderItems.keySet())) {
diff.add(entry);
}
} else {
if (!destIntentSet.contains(entry.mIntent)) {
diff.add(entry);
}
}
}
return diff;