summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/model
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-09-22 18:24:19 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-10-20 11:04:44 -0700
commitd249748abf357925b326d57ab68eb6c2b23c4ef6 (patch)
tree6a9734fb33ceb2bf0dd3a61ae5b6bf31cb22d8e4 /src/com/android/launcher3/model
parentf912beb2ee4b75af1fe8c710d6948b9737fed531 (diff)
downloadandroid_packages_apps_Trebuchet-d249748abf357925b326d57ab68eb6c2b23c4ef6.tar.gz
android_packages_apps_Trebuchet-d249748abf357925b326d57ab68eb6c2b23c4ef6.tar.bz2
android_packages_apps_Trebuchet-d249748abf357925b326d57ab68eb6c2b23c4ef6.zip
Making all provider calls using content resolver.
This will allow us to easily move db creation out of onCreate Change-Id: Idd949624b0a9c95e4451e48db7764b7b7922c40a
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r--src/com/android/launcher3/model/MigrateFromRestoreTask.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/model/MigrateFromRestoreTask.java b/src/com/android/launcher3/model/MigrateFromRestoreTask.java
index 786ab6009..9cabc8d41 100644
--- a/src/com/android/launcher3/model/MigrateFromRestoreTask.java
+++ b/src/com/android/launcher3/model/MigrateFromRestoreTask.java
@@ -135,7 +135,10 @@ public class MigrateFromRestoreTask {
new boolean[mTrgX][mTrgY], deepCopy(mCarryOver), true);
placement.find();
if (placement.finalPlacedItems.size() > 0) {
- long newScreenId = LauncherAppState.getLauncherProvider().generateNewScreenId();
+ long newScreenId = LauncherSettings.Settings.call(
+ mContext.getContentResolver(),
+ LauncherSettings.Settings.METHOD_NEW_SCREEN_ID)
+ .getLong(LauncherSettings.Settings.EXTRA_VALUE);
allScreens.add(newScreenId);
for (DbEntry item : placement.finalPlacedItems) {
if (!mCarryOver.remove(itemMap.get(item.id))) {