commit 461275d399412af4c6dd8ade1463281c91614a85
author Michael Jurka <mikejurka@google.com> Wed Mar 09 15:55:59 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 09 15:55:59 2011 -0800
tree d39628c517da354dd60fe456267a9823529b7427
parent 809cc36188c6acbf535820f8765cc9673e49b04c
parent bf32dbbbff0b235eaa21f2a5af679b8950a280e9

am bf32dbbb: Merge "Fix bug: workspace screens not being rendered in spring-loaded mode" into honeycomb-mr1

* commit 'bf32dbbbff0b235eaa21f2a5af679b8950a280e9':
  Fix bug: workspace screens not being rendered in spring-loaded mode

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 5f70bfb..e7865d2 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1184,8 +1184,9 @@
             final int pageCount = getChildCount();
             final long drawingTime = getDrawingTime();
             for (int i = 0; i < pageCount; i++) {
-                final View page = (View) getChildAt(i);
-                if (page.getVisibility() == VISIBLE && page.getAlpha() != 0f) {
+                final CellLayout page = (CellLayout) getChildAt(i);
+                if (page.getVisibility() == VISIBLE
+                        && (page.getAlpha() != 0f || page.getBackgroundAlpha() != 0f)) {
                     drawChild(canvas, page, drawingTime);
                 }
             }