Ensure taskbar background always transparent in notification tray. am: 84261f9d9b am: 16fdd8b4f0 am: 31dded9c2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21593273

Change-Id: Ie1ffe5ee021b247c69c343c9e38143d1aedc3edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Isganitis
2023-03-09 01:10:10 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 10 deletions
@@ -288,14 +288,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
updateButtonLayoutSpacing(); updateButtonLayoutSpacing();
updateStateForFlag(FLAG_SMALL_SCREEN, isPhoneButtonNavMode(mContext)); 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( mPropertyHolders.add(new StatePropertyHolder(
mControllers.taskbarDragLayerController.getNavbarBackgroundAlpha(), mControllers.taskbarDragLayerController.getNavbarBackgroundAlpha(),
flags -> ((flags & FLAG_NOTIFICATION_SHADE_EXPANDED) != 0 flags -> (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0));
&& (flags & FLAG_KEYGUARD_VISIBLE) == 0)
|| (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0));
// Rotation button // Rotation button
RotationButton rotationButton = new RotationButtonImpl( RotationButton rotationButton = new RotationButtonImpl(
@@ -590,10 +590,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
AnimatorSet anim = new AnimatorSet(); AnimatorSet anim = new AnimatorSet();
anim.play(mControllers.taskbarViewController.getTaskbarIconAlpha().get( anim.play(mControllers.taskbarViewController.getTaskbarIconAlpha().get(
TaskbarViewController.ALPHA_INDEX_NOTIFICATION_EXPANDED).animateToValue(alpha)); TaskbarViewController.ALPHA_INDEX_NOTIFICATION_EXPANDED).animateToValue(alpha));
if (!isThreeButtonNav()) { anim.play(mControllers.taskbarDragLayerController.getNotificationShadeBgTaskbar()
anim.play(mControllers.taskbarDragLayerController.getNotificationShadeBgTaskbar() .animateToValue(alpha));
.animateToValue(alpha));
}
anim.start(); anim.start();
if (skipAnim) { if (skipAnim) {
anim.end(); anim.end();