commit 9926128bd20daf97c5c8d1fd3a014f56f18dc9c5
author android-build SharedAccount <android-build@google.com> Fri Nov 19 13:45:02 2010 -0800
committer android-build SharedAccount <android-build@google.com> Fri Nov 19 13:45:02 2010 -0800
tree d233af4f0258306e78d7befad6b420922394ef67
parent 86026f9e4d16e4f2299382cdb6e4cd2162cb3088
parent faa28305134b0d391d2baf1bff5bff4710fe819f

Merge remote branch 'goog/master' into honeycomb-release

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index a2ed985..264e839 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -417,8 +417,12 @@
         if (heightMode == MeasureSpec.AT_MOST) {
             heightSize = maxChildHeight + verticalPadding;
         }
+        if (childCount > 0) {
+            mMaxScrollX = getChildOffset(childCount - 1) - getRelativeChildOffset(childCount - 1);
+        } else {
+            mMaxScrollX = 0;
+        }
 
-        mMaxScrollX = getChildOffset(childCount - 1) - getRelativeChildOffset(childCount - 1);
         setMeasuredDimension(widthSize, heightSize);
     }