Merge "Add some protologs around updates & animations of BubbleExpandedView" into main (d18802a8) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -921,7 +921,11 @@ public class BubbleExpandedView extends LinearLayout {
		return;
		}
		boolean isNew = mBubble == null \|\| didBackingContentChange(bubble);
		if (isNew \|\| bubble.getKey().equals(mBubble.getKey())) {
		boolean isUpdate = bubble != null && mBubble != null
		&& bubble.getKey().equals(mBubble.getKey());
		ProtoLog.d(WM_SHELL_BUBBLES, "BubbleExpandedView - update bubble=%s; isNew=%b; isUpdate=%b",
		bubble.getKey(), isNew, isUpdate);
		if (isNew \|\| isUpdate) {
		mBubble = bubble;
		mManageButton.setContentDescription(getResources().getString(
		R.string.bubbles_settings_button_description, bubble.getAppName()));

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -1128,6 +1128,8 @@ public class BubbleStackView extends FrameLayout
		if (expandedView != null) {
		// We need to be Z ordered on top in order for alpha animations to work.
		expandedView.setSurfaceZOrderedOnTop(true);
		ProtoLog.d(WM_SHELL_BUBBLES, "expandedViewAlphaAnimation - start=%s",
		expandedView.getBubbleKey());
		expandedView.setAnimating(true);
		mExpandedViewContainer.setVisibility(VISIBLE);
		}
		@@ -1143,6 +1145,8 @@ public class BubbleStackView extends FrameLayout
		// = 0f remains in effect.
		&& !mExpandedViewTemporarilyHidden) {
		expandedView.setSurfaceZOrderedOnTop(false);
		ProtoLog.d(WM_SHELL_BUBBLES, "expandedViewAlphaAnimation - end=%s",
		expandedView.getBubbleKey());
		expandedView.setAnimating(false);
		}
		}
		@@ -2171,7 +2175,14 @@ public class BubbleStackView extends FrameLayout
		final BubbleViewProvider previouslySelected = mExpandedBubble;
		mExpandedBubble = bubbleToSelect;
		mExpandedViewAnimationController.setExpandedView(getExpandedView());

		final String previouslySelectedKey = previouslySelected != null
		? previouslySelected.getKey()
		: "null";
		final String newlySelectedKey = mExpandedBubble != null
		? mExpandedBubble.getKey()
		: "null";
		ProtoLog.d(WM_SHELL_BUBBLES, "showNewlySelectedBubble b=%s, previouslySelected=%s,"
		+ " mIsExpanded=%b", newlySelectedKey, previouslySelectedKey, mIsExpanded);
		if (mIsExpanded) {
		hideCurrentInputMethod();

		@@ -2573,6 +2584,8 @@ public class BubbleStackView extends FrameLayout
		expandedView.setContentAlpha(0f);
		expandedView.setBackgroundAlpha(0f);

		ProtoLog.d(WM_SHELL_BUBBLES, "animateBubbleExpansion, setAnimating true for bubble=%s",
		expandedView.getBubbleKey());
		// We'll be starting the alpha animation after a slight delay, so set this flag early
		// here.
		expandedView.setAnimating(true);
		@@ -2737,6 +2750,11 @@ public class BubbleStackView extends FrameLayout
		mAnimatingOutSurfaceAlphaAnimator.reverse();
		mExpandedViewAlphaAnimator.start();

		if (mExpandedBubble != null) {
		ProtoLog.d(WM_SHELL_BUBBLES, "animateSwitchBubbles, switchingTo b=%s",
		mExpandedBubble.getKey());
		}

		if (mPositioner.showBubblesVertically()) {
		float translationX = mStackAnimationController.isStackOnLeftSide()
		? mAnimatingOutSurfaceContainer.getTranslationX() + mBubbleSize * 2