summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2009-12-11 11:31:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-11 11:31:39 -0800
commit15237db04c12c3bf193211a878aa69ea91e2052a (patch)
tree7634fa4d1e4629b492a8e06e8aadd7c677277972 /src/com/android
parent41ed4478ad9782a1d68de733e4cef8fec0647ef9 (diff)
parent8cf34293dc2f078bf023ac77d007f5182f9b9357 (diff)
downloadandroid_packages_apps_Trebuchet-15237db04c12c3bf193211a878aa69ea91e2052a.tar.gz
android_packages_apps_Trebuchet-15237db04c12c3bf193211a878aa69ea91e2052a.tar.bz2
android_packages_apps_Trebuchet-15237db04c12c3bf193211a878aa69ea91e2052a.zip
am 8cf34293: Launcher2 - This might fix the missing app problem and the crash in removeApp.
Merge commit '8cf34293dc2f078bf023ac77d007f5182f9b9357' into eclair-mr2 * commit '8cf34293dc2f078bf023ac77d007f5182f9b9357': Launcher2 - This might fix the missing app problem and the crash in removeApp.
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher2/AllAppsView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 88f074cdd..fa272b91f 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -804,7 +804,7 @@ public class AllAppsView extends RSSurfaceView
private Canvas mSelectionCanvas;
boolean mHasSurface = false;
- private boolean mAppsDirty = false;
+ private boolean mAppsDirty = true;
Params mParams;
State mState;
@@ -1051,7 +1051,7 @@ public class AllAppsView extends RSSurfaceView
void dirtyCheck() {
if (mHasSurface) {
- if (mAppsDirty) {
+ if (mAppsDirty && mAllAppsList != null) {
for (int i=0; i < mState.iconCount; i++) {
uploadAppIcon(i, mAllAppsList.get(i));
}