summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-03-09 15:49:40 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-09 15:49:40 -0800
commitbf32dbbbff0b235eaa21f2a5af679b8950a280e9 (patch)
tree946be05da89cff09cfa347262f465edf1c620ee4
parent72a174de20d06c8592b4de5bda4b13a96d05be7a (diff)
parenta4b4016bcd90da673ba245f83621ef7128fa1cd6 (diff)
downloadandroid_packages_apps_Trebuchet-bf32dbbbff0b235eaa21f2a5af679b8950a280e9.tar.gz
android_packages_apps_Trebuchet-bf32dbbbff0b235eaa21f2a5af679b8950a280e9.tar.bz2
android_packages_apps_Trebuchet-bf32dbbbff0b235eaa21f2a5af679b8950a280e9.zip
Merge "Fix bug: workspace screens not being rendered in spring-loaded mode" into honeycomb-mr1
-rw-r--r--src/com/android/launcher2/Workspace.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 5f70bfbeb..e7865d26f 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1184,8 +1184,9 @@ public class Workspace extends SmoothPagedView
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);
}
}