diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-03-26 10:59:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-26 10:59:13 -0700 |
| commit | 031d3d8838f5703e99b99a40d322e95c8fc640ee (patch) | |
| tree | a5915e3291ad7242bc2fdde72a57e870bdce6861 | |
| parent | 93eef082ec2da802ee4507fb2ca729e550f833f1 (diff) | |
| parent | c7e52f55d631319b970922edd28b45743624998e (diff) | |
| download | android_packages_apps_Trebuchet-031d3d8838f5703e99b99a40d322e95c8fc640ee.tar.gz android_packages_apps_Trebuchet-031d3d8838f5703e99b99a40d322e95c8fc640ee.tar.bz2 android_packages_apps_Trebuchet-031d3d8838f5703e99b99a40d322e95c8fc640ee.zip | |
Merge "Fixing potential crash when trying to create 0x0 bitmaps"
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 986e8528b..840ec459d 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -1107,6 +1107,8 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen bitmapWidth = drawable.getIntrinsicWidth(); bitmapHeight = drawable.getIntrinsicHeight(); } else { + if (cellHSpan < 1) cellHSpan = 1; + if (cellVSpan < 1) cellVSpan = 1; // Determine the size of the bitmap for the preview image we will generate // TODO: This actually uses the apps customize cell layout params, where as we make want // the Workspace params for more accuracy. |