diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-06-18 13:13:40 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-06-25 12:29:32 -0700 |
| commit | dcd297f05a866e07090d6e2af8fb4b15f28cb555 (patch) | |
| tree | 44a2b144c8b298cf12d43145cf0ef4fc55aa0324 /src/com/android/launcher3/PagedView.java | |
| parent | 211667e4c2efc6b0b7c5037aca77eecd50bd823d (diff) | |
| download | android_packages_apps_Trebuchet-dcd297f05a866e07090d6e2af8fb4b15f28cb555.tar.gz android_packages_apps_Trebuchet-dcd297f05a866e07090d6e2af8fb4b15f28cb555.tar.bz2 android_packages_apps_Trebuchet-dcd297f05a866e07090d6e2af8fb4b15f28cb555.zip | |
Initial implementation of Shrink-wrap
Change-Id: If73c7f7ca19ca62ff43134f515584354afef8507
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index abf8bbd14..842dc2034 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -491,7 +491,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - if (!mIsDataReady) { + if (!mIsDataReady || getChildCount() == 0) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); return; } @@ -650,7 +650,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - if (!mIsDataReady) { + if (!mIsDataReady || getChildCount() == 0) { return; } |