diff options
| author | Mike Cleron <mcleron@google.com> | 2011-02-03 21:17:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-03 21:17:09 -0800 |
| commit | f6141980c84f64618f083297bc37cfae7e0fca84 (patch) | |
| tree | 4d8822cde4f574cb5324fbef2eef107de6c95d12 /core | |
| parent | 4ad2547fe08bab430d7d9f9cc4b789410856c9c3 (diff) | |
| parent | e28b430486a407282d92813c957c81a9d63a337e (diff) | |
| download | frameworks_base-f6141980c84f64618f083297bc37cfae7e0fca84.zip frameworks_base-f6141980c84f64618f083297bc37cfae7e0fca84.tar.gz frameworks_base-f6141980c84f64618f083297bc37cfae7e0fca84.tar.bz2 | |
Merge changes I46acd27a,I70b322e1 into honeycomb
* changes:
aa is better than cc
Prevent ProgressBar from slowing down everything. bug #3422568
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 6981b9c..26f8627 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2224,10 +2224,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager final View[] children = mChildren; for (int i = 0; i < count; i++) { final View child = children[i]; - child.mRecreateDisplayList = (child.mPrivateFlags & INVALIDATED) == INVALIDATED; - child.mPrivateFlags &= ~INVALIDATED; - child.getDisplayList(); - child.mRecreateDisplayList = false; + if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE || child.getAnimation() != null) { + child.mRecreateDisplayList = (child.mPrivateFlags & INVALIDATED) == INVALIDATED; + child.mPrivateFlags &= ~INVALIDATED; + child.getDisplayList(); + child.mRecreateDisplayList = false; + } } } |