diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-02-16 21:56:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-16 21:56:39 +0000 |
commit | 93bc3c1e41b45d0a331db2589fd4c6a731cb591d (patch) | |
tree | fbbe7188b15b2aaff241fa55339b833c88925215 /src/com/android/launcher3/Workspace.java | |
parent | a74e92a75a363d0aeecc6f6cf05949fd25c306a2 (diff) | |
parent | 43bf11d9c95f76c2dfeb625b23cb458df81252b3 (diff) | |
download | android_packages_apps_Trebuchet-93bc3c1e41b45d0a331db2589fd4c6a731cb591d.tar.gz android_packages_apps_Trebuchet-93bc3c1e41b45d0a331db2589fd4c6a731cb591d.tar.bz2 android_packages_apps_Trebuchet-93bc3c1e41b45d0a331db2589fd4c6a731cb591d.zip |
Merge "Separating methods for updating the model to a sepatate class." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 3aa882587..56aa69e5c 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -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); } |