diff options
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 241b1a7..bcf263b 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -358,7 +358,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * When true, indicates that all 3d composited descendents are contained within this group, and * will not be interleaved with other 3d composited content. */ - static final int FLAG_IS_CONTAINED_VOLUME = 0x1000000; + static final int FLAG_ISOLATED_Z_VOLUME = 0x1000000; /** * Indicates which types of drawing caches are to be kept in memory. @@ -492,7 +492,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager mGroupFlags |= FLAG_ANIMATION_DONE; mGroupFlags |= FLAG_ANIMATION_CACHE; mGroupFlags |= FLAG_ALWAYS_DRAWN_WITH_CACHE; - mGroupFlags |= FLAG_IS_CONTAINED_VOLUME; + mGroupFlags |= FLAG_ISOLATED_Z_VOLUME; if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB) { mGroupFlags |= FLAG_SPLIT_MOTION_EVENTS; @@ -520,6 +520,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager case R.styleable.ViewGroup_clipToPadding: setClipToPadding(a.getBoolean(attr, true)); break; + case R.styleable.ViewGroup_isolatedZVolume: + setIsolatedZVolume(a.getBoolean(attr, true)); + break; case R.styleable.ViewGroup_animationCache: setAnimationCacheEnabled(a.getBoolean(attr, true)); break; @@ -3115,34 +3118,30 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * independent Z volume. Views drawn in one contained volume will not * interleave with views in another, even if their Z values are interleaved. * The default value is true. - * @see #setIsContainedVolume(boolean) - * - * @return True if the ViewGroup is a contained volume. + * @see #setIsolatedZVolume(boolean) * - * @hide + * @return True if the ViewGroup has an isolated Z volume. */ - public boolean isContainedVolume() { - return ((mGroupFlags & FLAG_IS_CONTAINED_VOLUME) != 0); + public boolean hasIsolatedZVolume() { + return ((mGroupFlags & FLAG_ISOLATED_Z_VOLUME) != 0); } /** - * By default, only direct children of a group can interleave with - * interleaved Z values. Set to false on individual groups to enable Z + * By default, only direct children of a group can interleave drawing order + * by interleaving Z values. Set to false on individual groups to enable Z * interleaving of views that aren't direct siblings. * - * @return True if the group should be a contained volume with its own Z - * ordering space, false if its decendents should join the current Z - * ordering volume. - * @attr ref android.R.styleable#ViewGroup_isContainedVolume - * - * @hide + * @return True if the group should be an isolated Z volume with its own Z + * ordering space, false if its decendents should inhabit the + * inherited Z ordering volume. + * @attr ref android.R.styleable#ViewGroup_isolateZVolume */ - public void setIsContainedVolume(boolean isContainedVolume) { - boolean previousValue = (mGroupFlags & FLAG_IS_CONTAINED_VOLUME) == FLAG_IS_CONTAINED_VOLUME; - if (isContainedVolume != previousValue) { - setBooleanFlag(FLAG_IS_CONTAINED_VOLUME, isContainedVolume); + public void setIsolatedZVolume(boolean isolateZVolume) { + boolean previousValue = (mGroupFlags & FLAG_ISOLATED_Z_VOLUME) == FLAG_ISOLATED_Z_VOLUME; + if (isolateZVolume != previousValue) { + setBooleanFlag(FLAG_ISOLATED_Z_VOLUME, isolateZVolume); if (mDisplayList != null) { - mDisplayList.setIsContainedVolume(isContainedVolume); + mDisplayList.setIsolatedZVolume(isolateZVolume); } } } |