am 4c826609: am a83ae6bf: am 330ae983: Merge "Fix issue where All Apps tab bar was too small" into honeycomb-mr2

* commit '4c826609208012e7219ecdacde4348b0dd7973bd':
  Fix issue where All Apps tab bar was too small

1 files changed, 2 insertions, 8 deletions

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index e1256d08b..932af8915 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -210,8 +210,7 @@ public class CustomizePagedView extends PagedViewWithDraggableItems
             mPageContentWidth = layout.getContentWidth();
             mPageContentHeight = layout.getContentHeight();
             mMinPageWidth = layout.getWidthBeforeFirstLayout();
-            removeAllViews();
-            invalidatePageData();
+            postInvalidatePageData(true);
         }
         if (mPageContentHeight > 0) {
             // Lock our height to the size of the page content
@@ -226,12 +225,7 @@ public class CustomizePagedView extends PagedViewWithDraggableItems
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         if (mWaitingToInitPages) {
             mWaitingToInitPages = false;
-            invalidatePageData();
-
-            // invalidatePageData() is what causes the child pages to be created. We need the
-            // children to be measured before layout, so force a new measure here.
-            measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY),
-                    MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.EXACTLY));
+            postInvalidatePageData(false);
         }
         super.onLayout(changed, left, top, right, bottom);
         mFirstLayout = false;