diff options
| author | Romain Guy <romainguy@google.com> | 2011-02-02 00:49:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 00:49:31 -0800 |
| commit | 57188f0d1d7225991f8f5afb2740ed4cc878305b (patch) | |
| tree | 00e13b8707c0ff853d652efb237389d433722aa5 /core | |
| parent | debeeef50408cf12f1041426e7438be266789a62 (diff) | |
| parent | c1f8bcffb8612ef5bdddc4bca6eca23804cbe453 (diff) | |
| download | frameworks_base-57188f0d1d7225991f8f5afb2740ed4cc878305b.zip frameworks_base-57188f0d1d7225991f8f5afb2740ed4cc878305b.tar.gz frameworks_base-57188f0d1d7225991f8f5afb2740ed4cc878305b.tar.bz2 | |
am c1f8bcff: Merge "Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433" into honeycomb
* commit 'c1f8bcffb8612ef5bdddc4bca6eca23804cbe453':
Fix incorrect dirty rectangle transformation in hardware layers. Bug #3413433
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 5d5a09a..09e1d89 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3537,6 +3537,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // Make sure we do not set both flags at the same time int opaqueFlag = isOpaque ? DIRTY_OPAQUE : DIRTY; + if (child.mLayerType != LAYER_TYPE_NONE) { + mPrivateFlags |= INVALIDATED; + mPrivateFlags &= ~DRAWING_CACHE_VALID; + child.mLocalDirtyRect.union(dirty); + } + final int[] location = attachInfo.mInvalidateChildLocation; location[CHILD_LEFT_INDEX] = child.mLeft; location[CHILD_TOP_INDEX] = child.mTop; @@ -3550,12 +3556,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager (int) (boundingRect.bottom + 0.5f)); } - if (child.mLayerType != LAYER_TYPE_NONE) { - mPrivateFlags |= INVALIDATED; - mPrivateFlags &= ~DRAWING_CACHE_VALID; - child.mLocalDirtyRect.union(dirty); - } - do { View view = null; if (parent instanceof View) { @@ -3639,7 +3639,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (mLayerType != LAYER_TYPE_NONE) { mLocalDirtyRect.union(dirty); } - + return mParent; } } else { |