Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84261f9d authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Ensure taskbar background always transparent in notification tray. 

Persistent, taskbar can be in light or dark modes. Since notification
tray has its own background color, we should hide ours to avoid clashing
with it.

Test: Manual
Fix: 270758899
Change-Id: Iedc6aae42aac30987af3259ccee11c5998e10517
parent d301c9b6

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+1 −6
Original line number Diff line number Diff line
@@ -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(

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+2 −4
Original line number Diff line number Diff line
@@ -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.start();

        if (skipAnim) {

            anim.end();