Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6141980 authored by Mike Cleron's avatar Mike Cleron Committed by Android (Google) Code Review
Browse files

Merge changes I46acd27a,I70b322e1 into honeycomb 

* changes:
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
parents 4ad2547f e28b4304

core/java/android/view/ViewGroup.java

+6 −4
Original line number Diff line number Diff line
@@ -2224,12 +2224,14 @@ 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];

            if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE || child.getAnimation() != null) {

                child.mRecreateDisplayList = (child.mPrivateFlags & INVALIDATED) == INVALIDATED;

                child.mPrivateFlags &= ~INVALIDATED;

                child.getDisplayList();

                child.mRecreateDisplayList = false;

            }

        }

    }



    /**

     * Draw one child of this View Group. This method is responsible for getting

packages/SystemUI/res/values-xlarge/colors.xml

+1 −1
Original line number Diff line number Diff line 
<?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>