commit dcd297f05a866e07090d6e2af8fb4b15f28cb555
author Adam Cohen <adamcohen@google.com> Tue Jun 18 13:13:40 2013 -0700
committer Adam Cohen <adamcohen@google.com> Tue Jun 25 12:29:32 2013 -0700
tree 44a2b144c8b298cf12d43145cf0ef4fc55aa0324
parent 211667e4c2efc6b0b7c5037aca77eecd50bd823d

Initial implementation of Shrink-wrap

Change-Id: If73c7f7ca19ca62ff43134f515584354afef8507

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index abf8bbd..842dc20 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -491,7 +491,7 @@
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if (!mIsDataReady) {
+        if (!mIsDataReady || getChildCount() == 0) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
             return;
         }
@@ -650,7 +650,7 @@
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (!mIsDataReady) {
+        if (!mIsDataReady || getChildCount() == 0) {
             return;
         }