diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-22 22:03:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-22 22:03:23 -0700 |
| commit | 0b48076529aa3710a2d9e35ae1cb391f77d897ae (patch) | |
| tree | aa84f2c83c1f30925dd32275d38626763f028197 | |
| parent | dbb654992673d8d1236d06a647c08b4b2c5e3103 (diff) | |
| parent | f8742be8abcb8e54e62fca04bc2811cc8ea3bda8 (diff) | |
| download | android_packages_apps_Trebuchet-0b48076529aa3710a2d9e35ae1cb391f77d897ae.tar.gz android_packages_apps_Trebuchet-0b48076529aa3710a2d9e35ae1cb391f77d897ae.tar.bz2 android_packages_apps_Trebuchet-0b48076529aa3710a2d9e35ae1cb391f77d897ae.zip | |
Merge "Workaround for wallpaper crash. (5191436)"
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rw-r--r-- | src/com/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(); |