Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)" into jb-dev

This commit is contained in:
Winson Chung authored and Android (Google) Code Review committed 2012-06-06 16:17:04 -07:00
commit 478244409e
12 files changed
+35 -29

No files matched your search

@@ -940,7 +940,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
@Override
public void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace) {
Log.d(TAG, "6549598 onLauncherTransitionEnd");
Log.d(TAG, "6549598 onLauncherTransitionEnd mDeferredSyncWidgetPageItems.size(): " + mDeferredSyncWidgetPageItems.size());
mInTransition = false;
for (AsyncTaskPageData d : mDeferredSyncWidgetPageItems) {
onSyncWidgetPageItems(d);
@@ -1108,7 +1108,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
public void syncAppsPageItems(int page, boolean immediate) {
Log.d(TAG, "6549598 syncAppsPageItems page: " + page);
Log.d(TAG, "6549598 syncAppsPageItems page: " + page + " mNumAppsPages: " + mNumAppsPages);
// ensure that we have the right number of items on the pages
int numCells = mCellCountX * mCellCountY;
int startIndex = page * numCells;