Merge "Skip taskbar animations from launcher state changes in phone mode" into main

This commit is contained in:
Tracy Zhou
2024-08-28 00:19:54 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 4 deletions
@@ -248,7 +248,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
}
mTaskbarLauncherStateController.updateStateForFlag(FLAG_VISIBLE, isVisible);
if (fromInit) {
if (fromInit || mControllers == null) {
duration = 0;
}
return mTaskbarLauncherStateController.applyState(duration, startAnimation);
@@ -246,7 +246,9 @@ public class TaskbarLauncherStateController {
resetIconAlignment();
mLauncher.getStateManager().addStateListener(mStateListener);
if (!mControllers.taskbarActivityContext.isPhoneMode()) {
mLauncher.getStateManager().addStateListener(mStateListener);
}
mLauncherState = launcher.getStateManager().getState();
updateStateForSysuiFlags(sysuiStateFlags, /*applyState*/ false);
@@ -412,7 +414,7 @@ public class TaskbarLauncherStateController {
}
public Animator applyState(long duration, boolean start) {
if (mIsDestroyed) {
if (mIsDestroyed || mControllers.taskbarActivityContext.isPhoneMode()) {
return null;
}
Animator animator = null;
@@ -861,7 +863,8 @@ public class TaskbarLauncherStateController {
"%s\tmTaskbarBackgroundAlpha=%.2f", prefix, mTaskbarBackgroundAlpha.value));
pw.println(String.format(
"%s\tmIconAlphaForHome=%.2f", prefix, mIconAlphaForHome.getValue()));
pw.println(String.format("%s\tmPrevState=%s", prefix, getStateString(mPrevState)));
pw.println(String.format("%s\tmPrevState=%s", prefix,
mPrevState == null ? null : getStateString(mPrevState)));
pw.println(String.format("%s\tmState=%s", prefix, getStateString(mState)));
pw.println(String.format("%s\tmLauncherState=%s", prefix, mLauncherState));
pw.println(String.format(