Added scale animation for taskbar pinning transition.

Animate the bubble bar icons size and padding for taskbar change mode
animation.

Bug: 345698412
Test: TaskbarPinningControllerTest
Flag: com.android.wm.shell.enable_bubble_bar
Change-Id: Ibdecabd1310203dc956f69673dc446a0e7e556a6
This commit is contained in:
mpodolian committed 2024-10-24 13:45:11 -07:00
1 parent eedc7ab8fd
commit 92d25cd21d
3 files changed
+49 -17

No files matched your search

@@ -107,9 +107,10 @@ public class BubbleBarViewController {
this::updateTranslationY);
private final AnimatedFloat mBubbleOffsetY = new AnimatedFloat(
this::updateBubbleOffsetY);
private final AnimatedFloat mBubbleBarTranslationYForPinning = new AnimatedFloat(
this::updateTranslationY);
private final AnimatedFloat mBubbleBarPinning = new AnimatedFloat(pinningProgress -> {
updateTranslationY();
setBubbleBarScaleAndPadding(pinningProgress);
});
// Modified when swipe up is happening on the bubble bar or task bar.
private float mBubbleBarSwipeUpTranslationY;
@@ -182,7 +183,7 @@ public class BubbleBarViewController {
float pinningValue = DisplayController.isTransientTaskbar(mActivity)
? PINNING_TRANSIENT
: PINNING_PERSISTENT;
mBubbleBarTranslationYForPinning.updateValue(pinningValue);
mBubbleBarPinning.updateValue(pinningValue);
mBarView.setController(new BubbleBarView.Controller() {
@Override
public float getBubbleBarTranslationY() {
@@ -236,9 +237,9 @@ public class BubbleBarViewController {
};
}
/** Returns animated float property for controlling pining Y position. */
public AnimatedFloat getBubbleBarTranslationYForPinning() {
return mBubbleBarTranslationYForPinning;
/** Returns animated float property responsible for pinning transition animation. */
public AnimatedFloat getBubbleBarPinning() {
return mBubbleBarPinning;
}
private BubbleBarFlyoutPositioner createFlyoutPositioner() {
@@ -609,9 +610,11 @@ public class BubbleBarViewController {
updateBubbleBarIconSizeAndPadding(newIconSize, newPadding, animate);
}
private int getBubbleBarIconSizeFromDeviceProfile(Resources res) {
DeviceProfile deviceProfile = mActivity.getDeviceProfile();
return getBubbleBarIconSizeFromDeviceProfile(res, mActivity.getDeviceProfile());
}
private int getBubbleBarIconSizeFromDeviceProfile(Resources res, DeviceProfile deviceProfile) {
DisplayMetrics dm = res.getDisplayMetrics();
float smallIconSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
APP_ICON_SMALL_DP, dm);
@@ -626,7 +629,10 @@ public class BubbleBarViewController {
}
private int getBubbleBarPaddingFromDeviceProfile(Resources res) {
DeviceProfile deviceProfile = mActivity.getDeviceProfile();
return getBubbleBarPaddingFromDeviceProfile(res, mActivity.getDeviceProfile());
}
private int getBubbleBarPaddingFromDeviceProfile(Resources res, DeviceProfile deviceProfile) {
DisplayMetrics dm = res.getDisplayMetrics();
float mediumIconSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
APP_ICON_MEDIUM_DP, dm);
@@ -673,14 +679,32 @@ public class BubbleBarViewController {
/** Computes translation y for taskbar pinning. */
private float getBubbleBarTranslationYForTaskbarPinning() {
if (mTaskbarSharedState == null) return 0f;
float animationProgress = mBubbleBarTranslationYForPinning.value;
float pinningProgress = mBubbleBarPinning.value;
if (mTaskbarSharedState.startTaskbarVariantIsTransient) {
return mapRange(animationProgress, /* min = */ 0f, mTaskbarTranslationDelta);
return mapRange(pinningProgress, /* min = */ 0f, mTaskbarTranslationDelta);
} else {
return mapRange(animationProgress, -mTaskbarTranslationDelta, /* max = */ 0f);
return mapRange(pinningProgress, -mTaskbarTranslationDelta, /* max = */ 0f);
}
}
private void setBubbleBarScaleAndPadding(float pinningProgress) {
Resources res = mActivity.getResources();
// determine icon scale for pinning
int persistentIconSize = res.getDimensionPixelSize(
R.dimen.bubblebar_icon_size_persistent_taskbar);
int transientIconSize = getBubbleBarIconSizeFromDeviceProfile(res,
mActivity.getTransientTaskbarDeviceProfile());
float pinningIconSize = mapRange(pinningProgress, transientIconSize, persistentIconSize);
// determine bubble bar padding for pinning
int persistentPadding = res.getDimensionPixelSize(
R.dimen.bubblebar_icon_spacing_persistent_taskbar);
int transientPadding = getBubbleBarPaddingFromDeviceProfile(res,
mActivity.getTransientTaskbarDeviceProfile());
float pinningPadding = mapRange(pinningProgress, transientPadding, persistentPadding);
mBarView.setIconSizeAndPaddingForPinning(pinningIconSize, pinningPadding);
}
/**
* Calculates the vertical difference in the bubble bar positions for pinned and transient
* taskbar modes.