diff options
| author | Chris Craik <ccraik@google.com> | 2014-01-29 22:51:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-29 22:51:29 +0000 |
| commit | de439dbe2c395a0c61331ffad567af1124782e6b (patch) | |
| tree | 6083c4bcfce8fa5682952089d95be61c7f18c44d /core/java/android/view/View.java | |
| parent | 5e31fdbacd11fa3750b82004aa80cef0260951e9 (diff) | |
| parent | 6657a6c53930eb0ff8d03317eb10ea7ddb0c49b4 (diff) | |
| download | frameworks_base-de439dbe2c395a0c61331ffad567af1124782e6b.zip frameworks_base-de439dbe2c395a0c61331ffad567af1124782e6b.tar.gz frameworks_base-de439dbe2c395a0c61331ffad567af1124782e6b.tar.bz2 | |
Merge "Update reordering method names, and make 3d reordering API public"
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 52b1b39..9576602 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -14263,8 +14263,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, (((ViewGroup) mParent).mGroupFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0); } if (this instanceof ViewGroup) { - displayList.setIsContainedVolume( - (((ViewGroup) this).mGroupFlags & ViewGroup.FLAG_IS_CONTAINED_VOLUME) != 0); + displayList.setIsolatedZVolume( + (((ViewGroup) this).mGroupFlags & ViewGroup.FLAG_ISOLATED_Z_VOLUME) != 0); } float alpha = 1; if (mParent instanceof ViewGroup && (((ViewGroup) mParent).mGroupFlags & |