Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 617ce55f authored Jun 20, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Jun 20, 2020

Merge "Always showContentVisibility(true) after switch/expand animations."...

Merge "Always showContentVisibility(true) after switch/expand animations." into rvc-dev am: c7477974 am: b0682c45 am: e5062ff2 am: fcf885f2

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

Change-Id: Ica68b7aa3e0420a482b9bbf07ec239c036befbb7

parents 85027153 fcf885f2

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -495,6 +495,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);

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}