diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 11:23:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-07 11:23:44 -0700 |
| commit | 790a604b9c32647711599710e21f0f00eb3d839c (patch) | |
| tree | eea12fecc27a06063c0a3a7b26a67e6ad1d1aa23 /core/java | |
| parent | c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c (diff) | |
| parent | 1e09597512fd7e6c62ea00e4f0a93d305717ca79 (diff) | |
| download | frameworks_base-790a604b9c32647711599710e21f0f00eb3d839c.zip frameworks_base-790a604b9c32647711599710e21f0f00eb3d839c.tar.gz frameworks_base-790a604b9c32647711599710e21f0f00eb3d839c.tar.bz2 | |
Merge change 6372 into donut
* changes:
Fixes #1963217. Increases the invalidate region in compatibility mode.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 65457c5..6f6e224 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -546,13 +546,16 @@ public final class ViewRoot extends Handler implements ViewParent, if (DEBUG_DRAW) Log.v(TAG, "Invalidate child: " + dirty); if (mCurScrollY != 0 || mTranslator != null) { mTempRect.set(dirty); + dirty = mTempRect; if (mCurScrollY != 0) { - mTempRect.offset(0, -mCurScrollY); + dirty.offset(0, -mCurScrollY); } if (mTranslator != null) { - mTranslator.translateRectInAppWindowToScreen(mTempRect); + mTranslator.translateRectInAppWindowToScreen(dirty); + } + if (mAttachInfo.mScalingRequired) { + dirty.inset(-1, -1); } - dirty = mTempRect; } mDirty.union(dirty); if (!mWillDrawSoon) { |