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

Merge "Don't reset Z order if the expanded view is temporarily animated out." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-01 15:35:55 +00:00
committed by Android (Google) Code Review
parent 41886ea17c 47709b1d3a
commit 3c942191cb
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,7 +268,7 @@ public class BubbleStackView extends FrameLayout
private boolean mIsDraggingStack = false; private boolean mIsDraggingStack = false;
/** Whether the expanded view has been hidden, because we are dragging out a bubble. */ /** Whether the expanded view has been hidden, because we are dragging out a bubble. */
private boolean mExpandedViewHidden = false; private boolean mExpandedViewTemporarilyHidden = false;
/** Animator for animating the expanded view's alpha (including the TaskView inside it). */ /** Animator for animating the expanded view's alpha (including the TaskView inside it). */
private final ValueAnimator mExpandedViewAlphaAnimator = ValueAnimator.ofFloat(0f, 1f); private final ValueAnimator mExpandedViewAlphaAnimator = ValueAnimator.ofFloat(0f, 1f);
@@ -968,7 +968,13 @@ public class BubbleStackView extends FrameLayout
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) { if (mExpandedBubble != null
&& mExpandedBubble.getExpandedView() != null
// The surface needs to be Z ordered on top for alpha values to work on the
// TaskView, and if we're temporarily hidden, we are still on the screen
// with alpha = 0f until we animate back. Stay Z ordered on top so the alpha
// = 0f remains in effect.
&& !mExpandedViewTemporarilyHidden) {
mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false); mExpandedBubble.getExpandedView().setSurfaceZOrderedOnTop(false);
mExpandedBubble.getExpandedView().setAlphaAnimating(false); mExpandedBubble.getExpandedView().setAlphaAnimating(false);
} }
@@ -983,7 +989,7 @@ public class BubbleStackView extends FrameLayout
mAnimatingOutSurfaceAlphaAnimator.setDuration(EXPANDED_VIEW_ALPHA_ANIMATION_DURATION); mAnimatingOutSurfaceAlphaAnimator.setDuration(EXPANDED_VIEW_ALPHA_ANIMATION_DURATION);
mAnimatingOutSurfaceAlphaAnimator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED); mAnimatingOutSurfaceAlphaAnimator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED);
mAnimatingOutSurfaceAlphaAnimator.addUpdateListener(valueAnimator -> { mAnimatingOutSurfaceAlphaAnimator.addUpdateListener(valueAnimator -> {
if (!mExpandedViewHidden) { if (!mExpandedViewTemporarilyHidden) {
mAnimatingOutSurfaceView.setAlpha((float) valueAnimator.getAnimatedValue()); mAnimatingOutSurfaceView.setAlpha((float) valueAnimator.getAnimatedValue());
} }
}); });
@@ -1596,7 +1602,7 @@ public class BubbleStackView extends FrameLayout
// If we're expanded, screenshot the currently expanded bubble (before expanding the newly // If we're expanded, screenshot the currently expanded bubble (before expanding the newly
// selected bubble) so we can animate it out. // selected bubble) so we can animate it out.
if (mIsExpanded && mExpandedBubble != null && mExpandedBubble.getExpandedView() != null if (mIsExpanded && mExpandedBubble != null && mExpandedBubble.getExpandedView() != null
&& !mExpandedViewHidden) { && !mExpandedViewTemporarilyHidden) {
if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) { if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
// Before screenshotting, have the real ActivityView show on top of other surfaces // Before screenshotting, have the real ActivityView show on top of other surfaces
// so that the screenshot doesn't flicker on top of it. // so that the screenshot doesn't flicker on top of it.
@@ -1722,13 +1728,13 @@ public class BubbleStackView extends FrameLayout
/** Animate the expanded view hidden. This is done while we're dragging out a bubble. */ /** Animate the expanded view hidden. This is done while we're dragging out a bubble. */
private void hideExpandedViewIfNeeded() { private void hideExpandedViewIfNeeded() {
if (mExpandedViewHidden if (mExpandedViewTemporarilyHidden
|| mExpandedBubble == null || mExpandedBubble == null
|| mExpandedBubble.getExpandedView() == null) { || mExpandedBubble.getExpandedView() == null) {
return; return;
} }
mExpandedViewHidden = true; mExpandedViewTemporarilyHidden = true;
// Scale down. // Scale down.
PhysicsAnimator.getInstance(mExpandedViewContainerMatrix) PhysicsAnimator.getInstance(mExpandedViewContainerMatrix)
@@ -1752,11 +1758,11 @@ public class BubbleStackView extends FrameLayout
* Animate the expanded view visible again. This is done when we're done dragging out a bubble. * Animate the expanded view visible again. This is done when we're done dragging out a bubble.
*/ */
private void showExpandedViewIfNeeded() { private void showExpandedViewIfNeeded() {
if (!mExpandedViewHidden) { if (!mExpandedViewTemporarilyHidden) {
return; return;
} }
mExpandedViewHidden = false; mExpandedViewTemporarilyHidden = false;
PhysicsAnimator.getInstance(mExpandedViewContainerMatrix) PhysicsAnimator.getInstance(mExpandedViewContainerMatrix)
.spring(AnimatableScaleMatrix.SCALE_X, .spring(AnimatableScaleMatrix.SCALE_X,
@@ -2085,7 +2091,7 @@ public class BubbleStackView extends FrameLayout
mExpandedViewContainer.setAnimationMatrix(mExpandedViewContainerMatrix); mExpandedViewContainer.setAnimationMatrix(mExpandedViewContainerMatrix);
}) })
.withEndActions(() -> { .withEndActions(() -> {
mExpandedViewHidden = false; mExpandedViewTemporarilyHidden = false;
mIsBubbleSwitchAnimating = false; mIsBubbleSwitchAnimating = false;
}) })
.start(); .start();