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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-20 00:01:05 +00:00
committed by Android (Google) Code Review
parent e0034ad1c5 ffa76031a2
commit c74779746e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
View File

@@ -494,6 +494,11 @@ public class BubbleExpandedView extends LinearLayout {
+ " bubble=" + getBubbleKey()); + " bubble=" + getBubbleKey());
} }
final float alpha = visibility ? 1f : 0f; final float alpha = visibility ? 1f : 0f;
if (alpha == mActivityView.getAlpha()) {
return;
}
mPointerView.setAlpha(alpha); mPointerView.setAlpha(alpha);
if (mActivityView != null) { if (mActivityView != null) {
mActivityView.setAlpha(alpha); mActivityView.setAlpha(alpha);

3
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -1901,6 +1901,8 @@ public class BubbleStackView extends FrameLayout
.withEndActions(() -> { .withEndActions(() -> {
if (mExpandedBubble != null if (mExpandedBubble != null
&& mExpandedBubble.getExpandedView() != null) { && mExpandedBubble.getExpandedView() != null) {
mExpandedBubble.getExpandedView()
.setContentVisibility(true);
mExpandedBubble.getExpandedView() mExpandedBubble.getExpandedView()
.setSurfaceZOrderedOnTop(false); .setSurfaceZOrderedOnTop(false);
} }
@@ -2045,6 +2047,7 @@ public class BubbleStackView extends FrameLayout
}) })
.withEndActions(() -> { .withEndActions(() -> {
if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) { if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
mExpandedBubble.getExpandedView().setContentVisibility(true);
mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false); mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false);
} }