Set proper interpolators and durations for the bubble bar animations
Set proper interpolator and duration for bubble bar expansion and collapsing animation. Also set animation properties for the taskbar fade in and out animations. Flag: com.android.wm.shell.enable_bubble_bar Test: Manual. Expand / collapse bubble bar when taskbar is pinned and expanded bubble bar would intersect the task bar. Fixes: 360821863 Change-Id: Ia83d6aecdae921721a31b45f22400f878040f3d6
This commit is contained in:
mpodolian
@@ -38,6 +38,7 @@ import android.view.ViewGroup;
|
||||
import android.view.accessibility.AccessibilityNodeInfo;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import com.android.app.animation.Interpolators;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.anim.AnimatorListeners;
|
||||
import com.android.launcher3.taskbar.BarsLocationAnimatorHelper;
|
||||
@@ -86,7 +87,7 @@ public class BubbleBarView extends FrameLayout {
|
||||
private static final int MAX_BUBBLES = 5;
|
||||
private static final int MAX_VISIBLE_BUBBLES_COLLAPSED = 2;
|
||||
private static final int ARROW_POSITION_ANIMATION_DURATION_MS = 200;
|
||||
private static final int WIDTH_ANIMATION_DURATION_MS = 200;
|
||||
private static final int WIDTH_ANIMATION_DURATION_MS = 400;
|
||||
private static final int SCALE_ANIMATION_DURATION_MS = 200;
|
||||
|
||||
/**
|
||||
@@ -143,7 +144,7 @@ public class BubbleBarView extends FrameLayout {
|
||||
|
||||
// An animator that represents the expansion state of the bubble bar, where 0 corresponds to the
|
||||
// collapsed state and 1 to the fully expanded state.
|
||||
private final ValueAnimator mWidthAnimator = ValueAnimator.ofFloat(0, 1);
|
||||
private ValueAnimator mWidthAnimator = createExpansionAnimator(/* expanding = */ false);
|
||||
|
||||
/** An animator used for animating individual bubbles in the bubble bar while expanded. */
|
||||
@Nullable
|
||||
@@ -207,35 +208,6 @@ public class BubbleBarView extends FrameLayout {
|
||||
|
||||
mBubbleBarBackground = new BubbleBarBackground(context, getBubbleBarExpandedHeight());
|
||||
setBackgroundDrawable(mBubbleBarBackground);
|
||||
|
||||
mWidthAnimator.setDuration(WIDTH_ANIMATION_DURATION_MS);
|
||||
|
||||
addAnimationCallBacks(mWidthAnimator,
|
||||
/* onStart= */ () -> mBubbleBarBackground.showArrow(true),
|
||||
/* onEnd= */ () -> {
|
||||
mBubbleBarBackground.showArrow(mIsBarExpanded);
|
||||
if (!mIsBarExpanded && mReorderRunnable != null) {
|
||||
mReorderRunnable.run();
|
||||
mReorderRunnable = null;
|
||||
}
|
||||
// If the bar was just collapsed and the overflow was the last bubble that was
|
||||
// selected, set the first bubble as selected.
|
||||
if (!mIsBarExpanded && mUpdateSelectedBubbleAfterCollapse != null
|
||||
&& mSelectedBubbleView != null
|
||||
&& mSelectedBubbleView.getBubble() instanceof BubbleBarOverflow) {
|
||||
BubbleView firstBubble = (BubbleView) getChildAt(0);
|
||||
mUpdateSelectedBubbleAfterCollapse.accept(firstBubble.getBubble().getKey());
|
||||
}
|
||||
// If the bar was just expanded, remove the dot from the selected bubble.
|
||||
if (mIsBarExpanded && mSelectedBubbleView != null) {
|
||||
mSelectedBubbleView.markSeen();
|
||||
}
|
||||
updateLayoutParams();
|
||||
},
|
||||
/* onUpdate= */ animator -> {
|
||||
updateBubblesLayoutProperties(mBubbleBarLocation);
|
||||
invalidate();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -1251,11 +1223,8 @@ public class BubbleBarView extends FrameLayout {
|
||||
mIsBarExpanded = isBarExpanded;
|
||||
updateArrowForSelected(/* shouldAnimate= */ false);
|
||||
setOrUnsetClickListener();
|
||||
if (isBarExpanded) {
|
||||
mWidthAnimator.start();
|
||||
} else {
|
||||
mWidthAnimator.reverse();
|
||||
}
|
||||
mWidthAnimator = createExpansionAnimator(isBarExpanded);
|
||||
mWidthAnimator.start();
|
||||
updateBubbleAccessibilityStates();
|
||||
announceExpandedStateChange();
|
||||
}
|
||||
@@ -1492,6 +1461,46 @@ public class BubbleBarView extends FrameLayout {
|
||||
return bubbles;
|
||||
}
|
||||
|
||||
/** Creates an animator based on the expanding or collapsing action. */
|
||||
private ValueAnimator createExpansionAnimator(boolean expanding) {
|
||||
float startValue = expanding ? 0 : 1;
|
||||
if ((mWidthAnimator != null && mWidthAnimator.isRunning())) {
|
||||
startValue = (float) mWidthAnimator.getAnimatedValue();
|
||||
mWidthAnimator.cancel();
|
||||
}
|
||||
float endValue = expanding ? 1 : 0;
|
||||
ValueAnimator animator = ValueAnimator.ofFloat(startValue, endValue);
|
||||
animator.setDuration(WIDTH_ANIMATION_DURATION_MS);
|
||||
animator.setInterpolator(Interpolators.EMPHASIZED);
|
||||
addAnimationCallBacks(animator,
|
||||
/* onStart= */ () -> mBubbleBarBackground.showArrow(true),
|
||||
/* onEnd= */ () -> {
|
||||
mBubbleBarBackground.showArrow(mIsBarExpanded);
|
||||
if (!mIsBarExpanded && mReorderRunnable != null) {
|
||||
mReorderRunnable.run();
|
||||
mReorderRunnable = null;
|
||||
}
|
||||
// If the bar was just collapsed and the overflow was the last bubble that was
|
||||
// selected, set the first bubble as selected.
|
||||
if (!mIsBarExpanded && mUpdateSelectedBubbleAfterCollapse != null
|
||||
&& mSelectedBubbleView != null
|
||||
&& mSelectedBubbleView.getBubble() instanceof BubbleBarOverflow) {
|
||||
BubbleView firstBubble = (BubbleView) getChildAt(0);
|
||||
mUpdateSelectedBubbleAfterCollapse.accept(firstBubble.getBubble().getKey());
|
||||
}
|
||||
// If the bar was just expanded, remove the dot from the selected bubble.
|
||||
if (mIsBarExpanded && mSelectedBubbleView != null) {
|
||||
mSelectedBubbleView.markSeen();
|
||||
}
|
||||
updateLayoutParams();
|
||||
},
|
||||
/* onUpdate= */ anim -> {
|
||||
updateBubblesLayoutProperties(mBubbleBarLocation);
|
||||
invalidate();
|
||||
});
|
||||
return animator;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the distance between the top left corner of the bubble bar to the center of the dot
|
||||
* of the selected bubble.
|
||||
|
||||
@@ -34,6 +34,7 @@ import android.widget.FrameLayout;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.app.animation.Interpolators;
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.anim.AnimatedFloat;
|
||||
@@ -68,6 +69,9 @@ public class BubbleBarViewController {
|
||||
private static final float APP_ICON_LARGE_DP = 52f;
|
||||
/** The dot size is defined as a percentage of the icon size. */
|
||||
private static final float DOT_TO_BUBBLE_SIZE_RATIO = 0.228f;
|
||||
public static final int TASKBAR_FADE_IN_DURATION_MS = 150;
|
||||
public static final int TASKBAR_FADE_IN_DELAY_MS = 50;
|
||||
public static final int TASKBAR_FADE_OUT_DURATION_MS = 100;
|
||||
private final SystemUiProxy mSystemUiProxy;
|
||||
private final TaskbarActivityContext mActivity;
|
||||
private final BubbleBarView mBarView;
|
||||
@@ -851,10 +855,15 @@ public class BubbleBarViewController {
|
||||
mTaskbarStashController.stashHotseat(isBubbleBarExpanded);
|
||||
} else if (!mBubbleStashController.isTransientTaskBar()) {
|
||||
boolean hideTaskbar = isBubbleBarExpanded && isIntersectingTaskbar();
|
||||
mTaskbarViewPropertiesProvider
|
||||
.getIconsAlpha()
|
||||
.animateToValue(hideTaskbar ? 0 : 1)
|
||||
.start();
|
||||
Animator taskbarAlphaAnimator = mTaskbarViewPropertiesProvider.getIconsAlpha()
|
||||
.animateToValue(hideTaskbar ? 0 : 1);
|
||||
taskbarAlphaAnimator.setDuration(hideTaskbar
|
||||
? TASKBAR_FADE_OUT_DURATION_MS : TASKBAR_FADE_IN_DURATION_MS);
|
||||
if (!hideTaskbar) {
|
||||
taskbarAlphaAnimator.setStartDelay(TASKBAR_FADE_IN_DELAY_MS);
|
||||
}
|
||||
taskbarAlphaAnimator.setInterpolator(Interpolators.LINEAR);
|
||||
taskbarAlphaAnimator.start();
|
||||
}
|
||||
if (!mBubbleStashController.isBubblesShowingOnHome()
|
||||
&& mTaskbarStashController.isHiddenForBubbles()) {
|
||||
|
||||
Reference in New Issue
Block a user