Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c74779746e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932514

Change-Id: Ia5bcd978e952e9231558cc6e8376dbd7c8e59f28

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);

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);
                         }