Merge "[Notif] Remove transient views on swipe out" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-05-24 03:47:27 +00:00
committed by Android (Google) Code Review

View File

@@ -3293,6 +3293,16 @@ public class NotificationStackScrollLayout extends ViewGroup
if (!childWasSwipedOut) {
Rect clipBounds = child.getClipBounds();
childWasSwipedOut = clipBounds != null && clipBounds.height() == 0;
if (childWasSwipedOut && child instanceof ExpandableView) {
// Clean up any potential transient views if the child has already been swiped
// out, as we won't be animating it further (due to its height already being
// clipped to 0.
ViewGroup transientContainer = ((ExpandableView) child).getTransientContainer();
if (transientContainer != null) {
transientContainer.removeTransientView(child);
}
}
}
int animationType = childWasSwipedOut
? AnimationEvent.ANIMATION_TYPE_REMOVE_SWIPED_OUT