summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
index b0861bfbd643..1f5b063b0aa2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
@@ -660,6 +660,14 @@ public class NotificationContentView extends FrameLayout {
private void updateContentTransformation() {
int visibleType = calculateVisibleType();
+ if (getTransformableViewForVisibleType(mVisibleType) == null) {
+ // Case where visible view was removed in middle of transformation. In this case, we
+ // just update immediately to the appropriate view.
+ mVisibleType = visibleType;
+ updateViewVisibilities(visibleType);
+ updateBackgroundColor(false);
+ return;
+ }
if (visibleType != mVisibleType) {
// A new transformation starts
mTransformationStartVisibleType = mVisibleType;