diff options
author | Winson Chung <winsonc@google.com> | 2013-10-28 14:40:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-28 14:40:58 -0700 |
commit | 2b8b78c68f3263e1e5b4c711974a94091d8987d2 (patch) | |
tree | 1b3d9a6d6848939544b4cc5bcd36e45818dc59e9 | |
parent | 9fd14da0b4b051cd288ae11aed49a75e1e5dc936 (diff) | |
parent | fb7cd745e73dbb22ec121d0c82e6373a89c29d56 (diff) | |
download | android_packages_apps_Trebuchet-2b8b78c68f3263e1e5b4c711974a94091d8987d2.tar.gz android_packages_apps_Trebuchet-2b8b78c68f3263e1e5b4c711974a94091d8987d2.tar.bz2 android_packages_apps_Trebuchet-2b8b78c68f3263e1e5b4c711974a94091d8987d2.zip |
am fb7cd745: Merge "Ensuring the widget page is full when shown (Bug 10883258)" into jb-ub-now-jetsonic
* commit 'fb7cd745e73dbb22ec121d0c82e6373a89c29d56':
Ensuring the widget page is full when shown (Bug 10883258)
-rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 13 | ||||
-rw-r--r-- | src/com/android/launcher3/AppsCustomizeTabHost.java | 7 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 175d5f83e..25cd9f2f1 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -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; } diff --git a/src/com/android/launcher3/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java index bfcf92ac2..697bd7ecf 100644 --- a/src/com/android/launcher3/AppsCustomizeTabHost.java +++ b/src/com/android/launcher3/AppsCustomizeTabHost.java @@ -367,6 +367,10 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona @Override public View getContent() { + View appsCustomizeContent = mAppsCustomizePane.getContent(); + if (appsCustomizeContent != null) { + return appsCustomizeContent; + } return mContent; } @@ -397,6 +401,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona @Override public void onLauncherTransitionStart(Launcher l, boolean animated, boolean toWorkspace) { + mAppsCustomizePane.onLauncherTransitionStart(l, animated, toWorkspace); if (animated) { enableAndBuildHardwareLayer(); } @@ -407,7 +412,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona @Override public void onLauncherTransitionStep(Launcher l, float t) { - // Do nothing + mAppsCustomizePane.onLauncherTransitionStep(l, t); } @Override |