From ffa76031a2fb17b2af97974cbb49edd79b85a99c Mon Sep 17 00:00:00 2001
From: Joshua Tsuji <tsuji@google.com>
Date: Fri, 19 Jun 2020 17:11:10 -0400
Subject: [PATCH] Always showContentVisibility(true) after switch/expand
 animations.

This usually happens via onSingleTaskDisplayDrawn but this is occassionally not called despite the display drawiing just fine.

Bug: 158787329
Test: open like 200 bubbles
Change-Id: I704f8e4246eb96cac5a62803f4e4b7c11f01b046
---
 .../src/com/android/systemui/bubbles/BubbleExpandedView.java | 5 +++++
 .../src/com/android/systemui/bubbles/BubbleStackView.java    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
index 8722ac9a36b58..7c3e027e2e655 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
@@ -494,6 +494,11 @@ public class BubbleExpandedView extends LinearLayout {
                     + " bubble=" + getBubbleKey());
         }
         final float alpha = visibility ? 1f : 0f;
+
+        if (alpha == mActivityView.getAlpha()) {
+            return;
+        }
+
         mPointerView.setAlpha(alpha);
         if (mActivityView != null) {
             mActivityView.setAlpha(alpha);
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 10bfcda90edb3..e97860c71efa1 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1901,6 +1901,8 @@ public class BubbleStackView extends FrameLayout
                                 .withEndActions(() -> {
                                     if (mExpandedBubble != null
                                             && mExpandedBubble.getExpandedView() != null) {
+                                        mExpandedBubble.getExpandedView()
+                                                .setContentVisibility(true);
                                         mExpandedBubble.getExpandedView()
                                                 .setSurfaceZOrderedOnTop(false);
                                     }
@@ -2045,6 +2047,7 @@ public class BubbleStackView extends FrameLayout
                     })
                     .withEndActions(() -> {
                         if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
+                            mExpandedBubble.getExpandedView().setContentVisibility(true);
                             mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false);
                         }