From f8742be8abcb8e54e62fca04bc2811cc8ea3bda8 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 22 Aug 2011 16:19:31 -0700
Subject: Workaround for wallpaper crash. (5191436)

- Adding a little time to the tab transition

Change-Id: Ia7615d93f471845e568742df828cde43c1b917c4
---
 res/values/config.xml                                        |  2 +-
 .../android/launcher2/WallpaperChooserDialogFragment.java    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 37710b696..e88a83eac 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -31,7 +31,7 @@
     <integer name="config_appsCustomizeWorkspaceShrinkTime">1000</integer>
 
     <!-- Tab transition animation duration -->
-    <integer name="config_tabTransitionDuration">200</integer>
+    <integer name="config_tabTransitionDuration">250</integer>
 
     <!-- The slope, in percent, of the drag movement needed to drag an item out of
          AppsCustomize (y / x * 100%)  -->
diff --git a/src/com/android/launcher2/WallpaperChooserDialogFragment.java b/src/com/android/launcher2/WallpaperChooserDialogFragment.java
index c9e21f2da..6e39da27f 100644
--- a/src/com/android/launcher2/WallpaperChooserDialogFragment.java
+++ b/src/com/android/launcher2/WallpaperChooserDialogFragment.java
@@ -307,9 +307,15 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
                     mBitmap.recycle();
                 }
 
-                mBitmap = b;
-                mWallpaperDrawable.setBitmap(b);
-                getView().postInvalidate();
+                View v = getView();
+                if (v != null) {
+                    mBitmap = b;
+                    mWallpaperDrawable.setBitmap(b);
+                    v.postInvalidate();
+                } else {
+                    mBitmap = null;
+                    mWallpaperDrawable.setBitmap(null);
+                }
                 mLoader = null;
             } else {
                b.recycle();
-- 
cgit v1.2.3