summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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
commitf6141980c84f64618f083297bc37cfae7e0fca84 (patch)
tree4d8822cde4f574cb5324fbef2eef107de6c95d12
parent4ad2547fe08bab430d7d9f9cc4b789410856c9c3 (diff)
parente28b430486a407282d92813c957c81a9d63a337e (diff)
Merge changes I46acd27a,I70b322e1 into honeycomb
* changes: aa is better than cc Prevent ProgressBar from slowing down everything. bug #3422568
-rw-r--r--core/java/android/view/ViewGroup.java10
-rw-r--r--packages/SystemUI/res/values-xlarge/colors.xml2
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 6981b9cd8526..26f8627836fc 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;
+ }
}
}
diff --git a/packages/SystemUI/res/values-xlarge/colors.xml b/packages/SystemUI/res/values-xlarge/colors.xml
index 1fd396d754b7..a7a70c3f41e9 100644
--- a/packages/SystemUI/res/values-xlarge/colors.xml
+++ b/packages/SystemUI/res/values-xlarge/colors.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<drawable name="status_bar_background">#000000</drawable>
- <drawable name="notification_icon_area_smoke">#CC000000</drawable>
+ <drawable name="notification_icon_area_smoke">#aa000000</drawable>
</resources>