diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-02-02 23:50:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-02 23:50:28 -0800 |
| commit | a1192eacc25eafad25bf409d4383a1e16edb9c71 (patch) | |
| tree | 8fe19d7cbabcbdc77cc213be6661ccef237e5feb /src/com/android/launcher2/PagedView.java | |
| parent | a7f801fc5b5715223e868ed599da69c5edf436ee (diff) | |
| parent | 8245a8685fc9f4802c9fa29a989854b2522fc588 (diff) | |
| download | android_packages_apps_Trebuchet-a1192eacc25eafad25bf409d4383a1e16edb9c71.tar.gz android_packages_apps_Trebuchet-a1192eacc25eafad25bf409d4383a1e16edb9c71.tar.bz2 android_packages_apps_Trebuchet-a1192eacc25eafad25bf409d4383a1e16edb9c71.zip | |
Merge "Adding hardware layers to All Apps" into honeycomb
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index c018cf1fa..e65c196fe 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -1308,8 +1308,8 @@ public abstract class PagedView extends ViewGroup { int lowerPageBound = getAssociatedLowerPageBound(page); int upperPageBound = getAssociatedUpperPageBound(page); for (int i = 0; i < count; ++i) { - final ViewGroup layout = (ViewGroup) getChildAt(i); - final int childCount = layout.getChildCount(); + Page layout = (Page) getChildAt(i); + final int childCount = layout.getPageChildCount(); if (lowerPageBound <= i && i <= upperPageBound) { if (mDirtyPageContent.get(i)) { syncPageItems(i); @@ -1317,7 +1317,7 @@ public abstract class PagedView extends ViewGroup { } } else { if (childCount > 0) { - layout.removeAllViews(); + layout.removeAllViewsOnPage(); } mDirtyPageContent.set(i, true); } @@ -1358,10 +1358,10 @@ public abstract class PagedView extends ViewGroup { ArrayList<Checkable> checked = new ArrayList<Checkable>(); final int childCount = getChildCount(); for (int i = 0; i < childCount; ++i) { - final ViewGroup layout = (ViewGroup) getChildAt(i); - final int grandChildCount = layout.getChildCount(); + Page layout = (Page) getChildAt(i); + final int grandChildCount = layout.getPageChildCount(); for (int j = 0; j < grandChildCount; ++j) { - final View v = layout.getChildAt(j); + final View v = layout.getChildOnPageAt(j); if (v instanceof Checkable && ((Checkable) v).isChecked()) { checked.add((Checkable) v); } @@ -1378,10 +1378,10 @@ public abstract class PagedView extends ViewGroup { if (mChoiceMode == CHOICE_MODE_SINGLE) { final int childCount = getChildCount(); for (int i = 0; i < childCount; ++i) { - final ViewGroup layout = (ViewGroup) getChildAt(i); - final int grandChildCount = layout.getChildCount(); + Page layout = (Page) getChildAt(i); + final int grandChildCount = layout.getPageChildCount(); for (int j = 0; j < grandChildCount; ++j) { - final View v = layout.getChildAt(j); + final View v = layout.getChildOnPageAt(j); if (v instanceof Checkable && ((Checkable) v).isChecked()) { return (Checkable) v; } |