diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index bafd5b4532..84bf02ec28 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -288,14 +288,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT updateButtonLayoutSpacing(); updateStateForFlag(FLAG_SMALL_SCREEN, isPhoneButtonNavMode(mContext)); - // Animate taskbar background when either.. - // notification shade expanded AND not on keyguard - // back is visible for bouncer mPropertyHolders.add(new StatePropertyHolder( mControllers.taskbarDragLayerController.getNavbarBackgroundAlpha(), - flags -> ((flags & FLAG_NOTIFICATION_SHADE_EXPANDED) != 0 - && (flags & FLAG_KEYGUARD_VISIBLE) == 0) - || (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); + flags -> (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); // Rotation button RotationButton rotationButton = new RotationButtonImpl( diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 1c8106f55a..d684485bca 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -590,10 +590,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { AnimatorSet anim = new AnimatorSet(); anim.play(mControllers.taskbarViewController.getTaskbarIconAlpha().get( TaskbarViewController.ALPHA_INDEX_NOTIFICATION_EXPANDED).animateToValue(alpha)); - if (!isThreeButtonNav()) { - anim.play(mControllers.taskbarDragLayerController.getNotificationShadeBgTaskbar() - .animateToValue(alpha)); - } + anim.play(mControllers.taskbarDragLayerController.getNotificationShadeBgTaskbar() + .animateToValue(alpha)); anim.start(); if (skipAnim) { anim.end();