commit 2ca811c530c3cf6f391f860264de1289b0d923e2
author The Android Automerger <android-build@android.com> Fri Dec 11 13:23:14 2009 -0800
committer The Android Automerger <android-build@android.com> Fri Dec 11 13:23:14 2009 -0800
tree 6f8817a5ce827db3a9b027afbbbb02a36b8c2d6d
parent 0a29eb42253f745a60aeccb67f5ddd5b8b4f6c0a
parent 8cf34293dc2f078bf023ac77d007f5182f9b9357

Merge branch 'eclair' into eclair-release

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 3c4ea77..4c98101 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -806,7 +806,7 @@
         private Canvas mSelectionCanvas;
 
         boolean mHasSurface = false;
-        private boolean mAppsDirty = false;
+        private boolean mAppsDirty = true;
 
         Params mParams;
         State mState;
@@ -1053,7 +1053,7 @@
 
         void dirtyCheck() {
             if (mHasSurface) {
-                if (mAppsDirty) {
+                if (mAppsDirty && mAllAppsList != null) {
                     for (int i=0; i < mState.iconCount; i++) {
                         uploadAppIcon(i, mAllAppsList.get(i));
                     }