summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-03-19 21:09:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-19 21:09:31 +0000
commit036a2409fced32087dcfe7044d8f01ddd06a94a6 (patch)
treebe612507ee23947cddfd5a3631298f085a23ee2c /core/java
parentfa38f238b1f35195fcef8ec7a66f3151c7c9f660 (diff)
parentd6a51b1137648adf0aea0580835660f56b1c33fe (diff)
Merge "Dispatching display list recreations also to transient views" into pi-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/ViewGroup.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 8e60a720f729..33fcf6a74aa1 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -4285,6 +4285,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
recreateChildDisplayList(child);
}
}
+ final int transientCount = mTransientViews == null ? 0 : mTransientIndices.size();
+ for (int i = 0; i < transientCount; ++i) {
+ View child = mTransientViews.get(i);
+ if (((child.mViewFlags & VISIBILITY_MASK) == VISIBLE || child.getAnimation() != null)) {
+ recreateChildDisplayList(child);
+ }
+ }
if (mOverlay != null) {
View overlayView = mOverlay.getOverlayView();
recreateChildDisplayList(overlayView);