diff options
| author | Brian Muramatsu <btmura@google.com> | 2012-10-03 14:47:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 14:47:32 -0700 |
| commit | a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773 (patch) | |
| tree | 40663ea59319c8bb8b5805e33181208dcf474076 /src/com/android/launcher2/LauncherModel.java | |
| parent | 30e64f52211e7691a88eb2dcbf16ba6f1635e302 (diff) | |
| parent | 5524b4957fc7c1c858037327429411efdb8fe7d6 (diff) | |
| download | android_packages_apps_Trebuchet-a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773.tar.gz android_packages_apps_Trebuchet-a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773.tar.bz2 android_packages_apps_Trebuchet-a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773.zip | |
Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev
Diffstat (limited to 'src/com/android/launcher2/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 86a9a84f4..e197b3501 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -379,8 +379,8 @@ public class LauncherModel extends BroadcastReceiver { */ static void moveItemInDatabase(Context context, final ItemInfo item, final long container, final int screen, final int cellX, final int cellY) { - String transaction = "DbDebug Modify item (" + item.title + ") in db, id: " + item.id + - " (" + item.container + ", " + item.screen + ", " + item.cellX + ", " + item.cellY + + String transaction = "DbDebug Modify item (" + item.title + ") in db, id: " + item.id + + " (" + item.container + ", " + item.screen + ", " + item.cellX + ", " + item.cellY + ") --> " + "(" + container + ", " + screen + ", " + cellX + ", " + cellY + ")"; Launcher.sDumpLogs.add(transaction); Log.d(TAG, transaction); @@ -411,8 +411,8 @@ public class LauncherModel extends BroadcastReceiver { */ static void modifyItemInDatabase(Context context, final ItemInfo item, final long container, final int screen, final int cellX, final int cellY, final int spanX, final int spanY) { - String transaction = "DbDebug Modify item (" + item.title + ") in db, id: " + item.id + - " (" + item.container + ", " + item.screen + ", " + item.cellX + ", " + item.cellY + + String transaction = "DbDebug Modify item (" + item.title + ") in db, id: " + item.id + + " (" + item.container + ", " + item.screen + ", " + item.cellX + ", " + item.cellY + ") --> " + "(" + container + ", " + screen + ", " + cellX + ", " + cellY + ")"; Launcher.sDumpLogs.add(transaction); Log.d(TAG, transaction); @@ -1234,7 +1234,7 @@ public class LauncherModel extends BroadcastReceiver { final boolean isSafeMode = manager.isSafeMode(); // Make sure the default workspace is loaded, if needed - mApp.getLauncherProvider().loadDefaultFavoritesIfNecessary(); + mApp.getLauncherProvider().loadDefaultFavoritesIfNecessary(0); synchronized (sBgLock) { sBgWorkspaceItems.clear(); |