aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 01:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Ensuring the widget page is full when shown (Bug 10883258)" into jb-ub-now-jetsonic

Browse Source
This commit is contained in:
Winson Chung
2013-10-28 21:37:34 +00:00
committed by Android (Google) Code Review
parent 7397e62460 7bb3752d20
commit fb7cd745e7
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/launcher3/AppsCustomizePagedView.java
View File

@@ -825,6 +825,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
@Override
public View getContent() {
if (getChildCount() > 0) {
return getChildAt(0);
}
return null;
}
@@ -848,7 +851,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
public void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace) {
mInTransition = false;
for (AsyncTaskPageData d : mDeferredSyncWidgetPageItems) {
onSyncWidgetPageItems(d);
onSyncWidgetPageItems(d, false);
}
mDeferredSyncWidgetPageItems.clear();
for (Runnable r : mDeferredPrepareLoadWidgetPreviewsTasks) {
@@ -1117,7 +1120,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
mRunningTasks.remove(task);
if (task.isCancelled()) return;
// do cleanup inside onSyncWidgetPageItems
onSyncWidgetPageItems(data);
onSyncWidgetPageItems(data, false);
}
}, mWidgetPreviewLoader);
@@ -1233,7 +1236,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
AsyncTaskPageData data = new AsyncTaskPageData(page, items,
maxPreviewWidth, maxPreviewHeight, null, null, mWidgetPreviewLoader);
loadWidgetPreviewsInBackground(null, data);
onSyncWidgetPageItems(data);
onSyncWidgetPageItems(data, immediate);
} else {
if (mInTransition) {
mDeferredPrepareLoadWidgetPreviewsTasks.add(this);
@@ -1272,8 +1275,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
}
private void onSyncWidgetPageItems(AsyncTaskPageData data) {
if (mInTransition) {
private void onSyncWidgetPageItems(AsyncTaskPageData data, boolean immediatelySyncItems) {
if (!immediatelySyncItems && mInTransition) {
mDeferredSyncWidgetPageItems.add(data);
return;
}