Merge "Fix taskbar visibility when default-to-desktop" into main

This commit is contained in:
Treehugger Robot authored and Android (Google) Code Review committed 2024-11-25 23:18:43 +00:00
commit f612dc1a5b
1 file changed
+10 -1
@@ -40,6 +40,7 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.content.Context;
import android.os.SystemClock;
import android.util.Log;
import android.view.animation.Interpolator;
@@ -581,7 +582,7 @@ public class TaskbarLauncherStateController {
float backgroundAlpha = isInLauncher && isTaskbarAlignedWithHotseat() ? 0 : 1;
AnimatedFloat taskbarBgOffset =
mControllers.taskbarDragLayerController.getTaskbarBackgroundOffset();
boolean showTaskbar = !isInLauncher || isInOverview;
boolean showTaskbar = shouldShowTaskbar(mLauncher, isInLauncher, isInOverview);
float taskbarBgOffsetEnd = showTaskbar ? 0f : 1f;
float taskbarBgOffsetStart = showTaskbar ? 1f : 0f;
@@ -714,6 +715,14 @@ public class TaskbarLauncherStateController {
return animatorSet;
}
private static boolean shouldShowTaskbar(Context context, boolean isInLauncher,
boolean isInOverview) {
if (DisplayController.showLockedTaskbarOnHome(context) && isInLauncher) {
return true;
}
return !isInLauncher || isInOverview;
}
private void setupPinnedTaskbarAnimation(AnimatorSet animatorSet, boolean showTaskbar,
AnimatedFloat taskbarBgOffset, float taskbarBgOffsetStart, float taskbarBgOffsetEnd,
long duration, Animator taskbarBackgroundAlpha) {