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

Merge "Revert changes to invalidateChild"

Browse Source
This commit is contained in:
John Reck
2014-06-19 18:16:08 +00:00
committed by Android (Google) Code Review
parent 33bee10eeb 96bb8adf4c
commit af0b9c83a3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4386,7 +4386,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
// Make sure we do not set both flags at the same time
int opaqueFlag = isOpaque ? PFLAG_DIRTY_OPAQUE : PFLAG_DIRTY;
if (child.mLayerType == LAYER_TYPE_SOFTWARE) {
if (child.mLayerType != LAYER_TYPE_NONE) {
mPrivateFlags |= PFLAG_INVALIDATED;
mPrivateFlags &= ~PFLAG_DRAWING_CACHE_VALID;
}
@@ -4497,7 +4497,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
location[CHILD_LEFT_INDEX] = left;
location[CHILD_TOP_INDEX] = top;
if (mLayerType == LAYER_TYPE_SOFTWARE) {
if (mLayerType != LAYER_TYPE_NONE) {
mPrivateFlags |= PFLAG_INVALIDATED;
}
@@ -4515,7 +4515,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
dirty.union(0, 0, mRight - mLeft, mBottom - mTop);
}
if (mLayerType == LAYER_TYPE_SOFTWARE) {
if (mLayerType != LAYER_TYPE_NONE) {
mPrivateFlags |= PFLAG_INVALIDATED;
}