diff options
author | Chris Craik <ccraik@google.com> | 2015-05-01 20:36:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 20:36:22 +0000 |
commit | f4ff8f701f8127ad9e187a30e9407375695a4b62 (patch) | |
tree | 15237784eb9919bf03f1310967f9a6fca2712236 /core/java/android/view/GhostView.java | |
parent | 04c0f415b566932a98a65076a403a2e3b589a86c (diff) | |
parent | f85d064b536d9b2028a83e21d98eac9b40b74e95 (diff) | |
download | frameworks_base-f4ff8f701f8127ad9e187a30e9407375695a4b62.zip frameworks_base-f4ff8f701f8127ad9e187a30e9407375695a4b62.tar.gz frameworks_base-f4ff8f701f8127ad9e187a30e9407375695a4b62.tar.bz2 |
Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
Diffstat (limited to 'core/java/android/view/GhostView.java')
-rw-r--r-- | core/java/android/view/GhostView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/GhostView.java b/core/java/android/view/GhostView.java index d58e7c0..bc38e1a 100644 --- a/core/java/android/view/GhostView.java +++ b/core/java/android/view/GhostView.java @@ -41,7 +41,7 @@ public class GhostView extends View { final ViewGroup parent = (ViewGroup) mView.getParent(); setGhostedVisibility(View.INVISIBLE); parent.mRecreateDisplayList = true; - parent.getDisplayList(); + parent.updateDisplayListIfDirty(); } @Override @@ -49,7 +49,7 @@ public class GhostView extends View { if (canvas instanceof DisplayListCanvas) { DisplayListCanvas dlCanvas = (DisplayListCanvas) canvas; mView.mRecreateDisplayList = true; - RenderNode renderNode = mView.getDisplayList(); + RenderNode renderNode = mView.updateDisplayListIfDirty(); if (renderNode.isValid()) { dlCanvas.insertReorderBarrier(); // enable shadow for this rendernode dlCanvas.drawRenderNode(renderNode); @@ -84,7 +84,7 @@ public class GhostView extends View { final ViewGroup parent = (ViewGroup) mView.getParent(); if (parent != null) { parent.mRecreateDisplayList = true; - parent.getDisplayList(); + parent.updateDisplayListIfDirty(); } } } |