Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "New Pipeline: Fix a crash when the silent header was removed then qickly re-added."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-11 05:59:53 +00:00
committed by Android (Google) Code Review
parent a3d3b6365d 391ae10c4e
commit 44b9f407e7
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -4631,6 +4631,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
public void addContainerViewAt(View v, int index) {
Assert.isMainThread();
ensureRemovedFromTransientContainer(v);
addView(v, index);
if (v instanceof ExpandableNotificationRow && mController.isShowingEmptyShadeView()) {
mController.updateShowEmptyShadeView();
@@ -4640,6 +4641,22 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
updateSpeedBumpIndex();
}
private void ensureRemovedFromTransientContainer(View v) {
if (v.getParent() == this && v instanceof SectionHeaderView) {
ExpandableView expandableView = (ExpandableView) v;
ViewGroup transientContainer = expandableView.getTransientContainer();
// If the child is animating away, it will still have a parent, so
// detach it first
// TODO: We should really cancel the active animations here. This will
// happen automatically when the view's intro animation starts, but
// it's a fragile link.
if (transientContainer != null) {
transientContainer.removeTransientView(v);
expandableView.setTransientContainer(null);
}
}
}
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public void runAfterAnimationFinished(Runnable runnable) {
mAnimationFinishedRunnables.add(runnable);