diff options
| author | Chet Haase <chet@google.com> | 2011-03-07 18:12:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-07 18:12:34 -0800 |
| commit | 4bd6ccd25162a7634a90cfde72dcdc7d581d9a88 (patch) | |
| tree | a693620e273c898403f1784ed4bbc136684ebd08 /core | |
| parent | 25b81110b1a4d8882727ebdb8aef523f108b53fd (diff) | |
| parent | 88172fe49cf78f73fa7bf2b1bde665b45b1712ca (diff) | |
| download | frameworks_base-4bd6ccd25162a7634a90cfde72dcdc7d581d9a88.zip frameworks_base-4bd6ccd25162a7634a90cfde72dcdc7d581d9a88.tar.gz frameworks_base-4bd6ccd25162a7634a90cfde72dcdc7d581d9a88.tar.bz2 | |
Merge "Restore save/restore calls removed recently" into honeycomb-mr1
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index fa24d30..32c9e27 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(); |