commit 9da5812d63e1c6047d532f8b10ae2fc28cab17aa
author The Android Automerger <android-build@android.com> Tue Mar 23 09:22:06 2010 -0700
committer The Android Automerger <android-build@android.com> Tue Mar 23 09:22:06 2010 -0700
tree 6ef94c83404e947156db04b2863de02068b82718
parent 996229da9a4b47e80dd5254be7e501f4b6a3ba9b
parent 878f086f754c26d096134e35c33483800585ad2b

Merge branch 'master' into froyo-release

src/com/android/launcher2/AllApps3D.java

diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java
index 5b17b10..8467b39 100644
--- a/src/com/android/launcher2/AllApps3D.java
+++ b/src/com/android/launcher2/AllApps3D.java
@@ -809,8 +809,12 @@
         }
     }
 
+    /**
+     * If sRollo is null, then we're not visible.  This is also used to guard against
+     * sRollo being null.
+     */
     public boolean isVisible() {
-        return mZoom > 0.001f;
+        return sRollo != null && mZoom > 0.001f;
     }
 
     public boolean isOpaque() {