Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I46acd27a,I70b322e1 into honeycomb

Browse Source 
* changes:
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
This commit is contained in:
Mike Cleron
2011-02-03 21:17:09 -08:00
committed by Android (Google) Code Review
parent 4ad2547fe0 e28b430486
commit f6141980c8
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewGroup.java
View File

@@ -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;
}
}
}

2
packages/SystemUI/res/values-xlarge/colors.xml
View File

@@ -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>