Merge "Add support for taskbar background to wrap around hotseat" into main

This commit is contained in:
Jon Miranda authored and Android (Google) Code Review committed 2024-07-30 15:59:48 +00:00
commit e8b47c540f
8 files changed
+132 -12

No files matched your search

@@ -42,6 +42,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ValueAnimator;
import android.app.RemoteAction;
import android.graphics.Rect;
import android.graphics.drawable.Icon;
import android.os.SystemClock;
import android.util.Log;
@@ -202,6 +203,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* by not scaling the height of the taskbar background.
*/
private static final int TRANSITION_UNSTASH_SUW_MANUAL = 3;
private static final Rect EMPTY_RECT = new Rect();
@Retention(RetentionPolicy.SOURCE)
@IntDef(value = {
@@ -713,7 +715,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
fullLengthAnimatorSet.play(mControllers.stashedHandleViewController
.createRevealAnimToIsStashed(isStashed));
.createRevealAnimToIsStashed(isStashed, EMPTY_RECT));
// Return the stashed handle to its default scale in case it was changed as part of the
// feedforward hint. Note that the reveal animation above also visually scales it.
fullLengthAnimatorSet.play(mTaskbarStashedHandleHintScale.animateToValue(1f));
@@ -763,6 +765,19 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
}
Rect taskbarToHotseatOffsets = new Rect();
if (enableScalingRevealHomeAnimation() && animationType == TRANSITION_HOME_TO_APP) {
Rect hotseatRect = new Rect();
mActivity.getHotseatBounds(hotseatRect);
// Calculate and store offsets so that we can sync with the taskbar stashed handle
taskbarToHotseatOffsets.set(
mActivity.calculateTaskbarToHotseatOffsets(hotseatRect));
as.addListener(AnimatorListeners.forEndCallback(
() -> mActivity.calculateTaskbarToHotseatOffsets(EMPTY_RECT)));
}
play(as, mTaskbarStashedHandleAlpha.animateToValue(stashedHandleAlphaTarget),
backgroundAndHandleAlphaStartDelay,
backgroundAndHandleAlphaDuration, LINEAR);
@@ -808,10 +823,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
mControllers.taskbarViewController.addRevealAnimToIsStashed(skippable, isStashed, duration,
EMPHASIZED, animationType == TRANSITION_UNSTASH_SUW_MANUAL);
EMPHASIZED, animationType == TRANSITION_UNSTASH_SUW_MANUAL,
animationType == TRANSITION_HOME_TO_APP);
play(skippable, mControllers.stashedHandleViewController
.createRevealAnimToIsStashed(isStashed), 0, duration, EMPHASIZED);
.createRevealAnimToIsStashed(isStashed, taskbarToHotseatOffsets), 0, duration,
EMPHASIZED);
// Return the stashed handle to its default scale in case it was changed as part of the
// feedforward hint. Note that the reveal animation above also visually scales it.