am 7f0acdde: Deferring create hardware layers until we load widget pages. (5330412)

* commit '7f0acdde9679eb545abb8bc5373e1938c420bf63':
  Deferring create hardware layers until we load widget pages. (5330412)
This commit is contained in:
Winson Chung
2011-09-20 14:13:49 -07:00
committed by Android Git Automerger
@@ -600,6 +600,19 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
// Clean up all the async tasks
Iterator<AppsCustomizeAsyncTask> iter = mRunningTasks.iterator();
while (iter.hasNext()) {
AppsCustomizeAsyncTask task = (AppsCustomizeAsyncTask) iter.next();
task.cancel(false);
iter.remove();
}
}
public void setContentType(ContentType type) {
mContentType = type;
invalidatePageData(0, (type != ContentType.Applications));
@@ -982,7 +995,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
prepareLoadWidgetPreviewsTask(page, items, cellWidth, cellHeight, mWidgetCountX);
}
PagedViewGridLayout layout = (PagedViewGridLayout) getPageAt(page);
layout.createHardwareLayer();
}
private void loadWidgetPreviewsInBackground(AppsCustomizeAsyncTask task,
AsyncTaskPageData data) {
@@ -1073,6 +1085,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
if (iy > 0) lp.topMargin = mWidgetHeightGap;
layout.addView(widget, lp);
}
layout.createHardwareLayer();
invalidate();
forceUpdateAdjacentPagesAlpha();