aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Separating methods for updating the model to a sepatate class." into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-16 21:56:39 +00:00
committed by Android (Google) Code Review
parent a74e92a75a 43bf11d9c9
commit 93bc3c1e41
17 changed files with 450 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/Workspace.java
View File

@@ -2654,8 +2654,8 @@ public class Workspace extends PagedView
}
}
LauncherModel.modifyItemInDatabase(mLauncher, info, container, screenId, lp.cellX,
lp.cellY, item.spanX, item.spanY);
mLauncher.getModelWriter().modifyItemInDatabase(info, container, screenId,
lp.cellX, lp.cellY, item.spanX, item.spanY);
} else {
if (!returnToOriginalCellToPreventShuffling) {
onNoCellFound(dropTargetLayout);
@@ -3387,7 +3387,7 @@ public class Workspace extends PagedView
}
// Add the item to DB before adding to screen ensures that the container and other
// values of the info is properly updated.
LauncherModel.addOrMoveItemInDatabase(mLauncher, info, container, screenId,
mLauncher.getModelWriter().addOrMoveItemInDatabase(info, container, screenId,
mTargetCell[0], mTargetCell[1]);
addInScreen(view, container, screenId, mTargetCell[0], mTargetCell[1],
@@ -4025,7 +4025,7 @@ public class Workspace extends PagedView
HashSet<String> packages = new HashSet<>(1);
packages.add(packageName);
ItemInfoMatcher matcher = ItemInfoMatcher.ofPackages(packages, user);
LauncherModel.deleteItemsFromDatabase(mLauncher, matcher);
mLauncher.getModelWriter().deleteItemsFromDatabase(matcher);
removeItemsByMatcher(matcher);
}