diff options
author | Adam Cohen <adamcohen@google.com> | 2011-08-03 11:49:05 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-08-03 11:49:05 -0700 |
commit | 4e012846cd09caa85b018c36810e9a64adb87640 (patch) | |
tree | 6c0f7ba71a2e5dd10573c313c11a88d6b0bb69af /src | |
parent | 375b01e38fd61db81162a4ffaddd4d7a7c337f7d (diff) | |
download | android_packages_apps_Trebuchet-4e012846cd09caa85b018c36810e9a64adb87640.tar.gz android_packages_apps_Trebuchet-4e012846cd09caa85b018c36810e9a64adb87640.tar.bz2 android_packages_apps_Trebuchet-4e012846cd09caa85b018c36810e9a64adb87640.zip |
Revert "Clear the bitmap associated with canvases."
This reverts commit 9b9d48f28926371eab94c425b1d54150732fa08f.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher2/CachedTextView.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher2/HolographicOutlineHelper.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher2/IconCache.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher2/Utilities.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 4 |
7 files changed, 0 insertions, 15 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index e5fe7bd26..e9c22ff07 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -419,7 +419,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen mCanvas.save(); preview.draw(mCanvas); mCanvas.restore(); - mCanvas.setBitmap(null); createItemInfo.spanX = createItemInfo.spanY = 1; } @@ -700,7 +699,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen c.save(); c.drawBitmap(b, 0, 0, null); c.restore(); - c.setBitmap(null); images.add(outline); } @@ -749,7 +747,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen d.setBounds(x, y, x + w, y + h); d.draw(c); d.setBounds(oldBounds); // Restore the bounds - c.setBitmap(null); } } private Bitmap getShortcutPreview(ResolveInfo info, int cellWidth, int cellHeight) { diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index bd3a4bde5..476d06374 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -200,7 +200,6 @@ public class BubbleTextView extends TextView implements VisibilityChangedBroadca canvas.setBitmap(b); drawWithPadding(canvas, padding); mOutlineHelper.applyExtraThickExpensiveOutlineWithBlur(b, canvas, glowColor, outlineColor); - canvas.setBitmap(null); return b; } diff --git a/src/com/android/launcher2/CachedTextView.java b/src/com/android/launcher2/CachedTextView.java index f9f68a0d4..ac2cc3b5c 100644 --- a/src/com/android/launcher2/CachedTextView.java +++ b/src/com/android/launcher2/CachedTextView.java @@ -130,7 +130,6 @@ public class CachedTextView extends TextView { setAlpha(prevAlpha); mIsBuildingCache = false; mCacheCanvas.restore(); - mCacheCanvas.setBitmap(null); // A hack-- we set the text to be one space (we don't make it empty just to avoid any // potential issues with text measurement, like line height, etc.) so that the text view diff --git a/src/com/android/launcher2/HolographicOutlineHelper.java b/src/com/android/launcher2/HolographicOutlineHelper.java index 748d89e09..d2e1e7eb9 100644 --- a/src/com/android/launcher2/HolographicOutlineHelper.java +++ b/src/com/android/launcher2/HolographicOutlineHelper.java @@ -199,7 +199,6 @@ public class HolographicOutlineHelper { mHolographicPaint); // cleanup - srcDstCanvas.setBitmap(null); brightOutline.recycle(); thickOuterBlur.recycle(); thickInnerBlur.recycle(); diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 20c5f34ad..2977383a9 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -101,7 +101,6 @@ public class IconCache { Canvas c = new Canvas(b); d.setBounds(0, 0, b.getWidth(), b.getHeight()); d.draw(c); - c.setBitmap(null); return b; } diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java index c63c82206..775833391 100644 --- a/src/com/android/launcher2/Utilities.java +++ b/src/com/android/launcher2/Utilities.java @@ -145,7 +145,6 @@ final class Utilities { icon.setBounds(left, top, left+width, top+height); icon.draw(canvas); icon.setBounds(sOldBounds); - canvas.setBitmap(null); return bitmap; } @@ -212,8 +211,6 @@ final class Utilities { canvas.drawBitmap(bitmap, 0.0f, 0.0f, sDisabledPaint); - canvas.setBitmap(null); - return disabled; } } @@ -330,7 +327,6 @@ final class Utilities { c.drawText(lineText, x, y, mTextPaint); } - c.setBitmap(null); return b; } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 26c00ad8d..560448ee3 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1985,7 +1985,6 @@ public class Workspace extends SmoothPagedView canvas.setBitmap(b); drawDragView(v, canvas, padding, true); mOutlineHelper.applyOuterBlur(b, canvas, outlineColor); - canvas.setBitmap(null); return b; } @@ -2002,7 +2001,6 @@ public class Workspace extends SmoothPagedView canvas.setBitmap(b); drawDragView(v, canvas, padding, false); mOutlineHelper.applyMediumExpensiveOutlineWithBlur(b, canvas, outlineColor, outlineColor); - canvas.setBitmap(null); return b; } @@ -2029,7 +2027,6 @@ public class Workspace extends SmoothPagedView p.setFilterBitmap(true); canvas.drawBitmap(orig, src, dst, p); mOutlineHelper.applyMediumExpensiveOutlineWithBlur(b, canvas, outlineColor, outlineColor); - canvas.setBitmap(null); return b; } @@ -2053,7 +2050,6 @@ public class Workspace extends SmoothPagedView canvas.drawRoundRect(new RectF(inset, inset, iconWidth - inset, iconHeight - inset), rectRadius, rectRadius, mExternalDragOutlinePaint); mOutlineHelper.applyMediumExpensiveOutlineWithBlur(b, canvas, outlineColor, outlineColor); - canvas.setBitmap(null); return b; } |