Merge "Clear the bitmap associated with canvases."

src/com/android/launcher2/Workspace.java

@@ -1983,6 +1983,7 @@ public class Workspace extends SmoothPagedView
         canvas.setBitmap(b);
         drawDragView(v, canvas, padding, true);
         mOutlineHelper.applyOuterBlur(b, canvas, outlineColor);
+        canvas.setBitmap(null);
 
         return b;
     }
@@ -1999,6 +2000,7 @@ public class Workspace extends SmoothPagedView
         canvas.setBitmap(b);
         drawDragView(v, canvas, padding, false);
         mOutlineHelper.applyMediumExpensiveOutlineWithBlur(b, canvas, outlineColor, outlineColor);
+        canvas.setBitmap(null);
         return b;
     }
 
@@ -2025,6 +2027,7 @@ 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;
     }
@@ -2048,6 +2051,7 @@ 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;
     }