Ensure taskbar background always transparent in notification tray. am: 84261f9d9b

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

Change-Id: I301369bdce2bf00ef00d95d75ae91365022e4d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Isganitis
2023-03-09 00:12:04 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 10 deletions

View File

@@ -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(

View File

@@ -589,10 +589,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();