From 88172fe49cf78f73fa7bf2b1bde665b45b1712ca Mon Sep 17 00:00:00 2001 From: Chet Haase Date: Mon, 7 Mar 2011 17:36:33 -0800 Subject: [PATCH] Restore save/restore calls removed recently Calls thought to be duplicates were removed, which caused rendering problems for Browser as well as crashes in the widget list and music. Change-Id: I6364aaa362619ea3dd368990304d61d84bbe2a90 --- core/java/android/view/View.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index fa24d307a8668..32c9e27048d52 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8563,6 +8563,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility canvas.onPreDraw(mLocalDirtyRect); mLocalDirtyRect.setEmpty(); + final int restoreCount = canvas.save(); + computeScroll(); canvas.translate(-mScrollX, -mScrollY); @@ -8576,6 +8578,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility draw(canvas); } + canvas.restoreToCount(restoreCount); } finally { canvas.onPostDraw(); mHardwareLayer.end(currentCanvas); @@ -8725,6 +8728,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility // The dirty rect should always be null for a display list canvas.onPreDraw(null); + final int restoreCount = canvas.save(); + computeScroll(); canvas.translate(-mScrollX, -mScrollY); mPrivateFlags |= DRAWN | DRAWING_CACHE_VALID; @@ -8737,6 +8742,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility draw(canvas); } + canvas.restoreToCount(restoreCount); } finally { canvas.onPostDraw();