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

Commit 0633ff73 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due... 

Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due to the screen off animation." into sc-dev am: b5678c5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098663

Change-Id: I3fac188eca5a592388e134f24591d30d25778026
parents 8756a79b b5678c5a

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java

+10 −2
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public class NotificationIconAreaController implements 
    private final DozeParameters mDozeParameters;

    private final Optional<Bubbles> mBubblesOptional;

    private final StatusBarWindowController mStatusBarWindowController;

    private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;



    private int mIconSize;

    private int mIconHPadding;
@@ -119,7 +120,8 @@ public class NotificationIconAreaController implements 
            Optional<Bubbles> bubblesOptional,

            DemoModeController demoModeController,

            DarkIconDispatcher darkIconDispatcher,

            StatusBarWindowController statusBarWindowController) {

            StatusBarWindowController statusBarWindowController,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {

        mContrastColorUtil = ContrastColorUtil.getInstance(context);

        mContext = context;

        mStatusBarStateController = statusBarStateController;
@@ -133,6 +135,7 @@ public class NotificationIconAreaController implements 
        mDemoModeController = demoModeController;

        mDemoModeController.addCallback(this);

        mStatusBarWindowController = statusBarWindowController;

        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        notificationListener.addNotificationSettingsListener(mSettingsListener);



        initializeNotificationAreaViews(context);
@@ -677,7 +680,12 @@ public class NotificationIconAreaController implements 
        }

        boolean visible = mBypassController.getBypassEnabled()

                || mWakeUpCoordinator.getNotificationsFullyHidden();

        if (mStatusBarStateController.getState() != StatusBarState.KEYGUARD) {



        // Hide the AOD icons if we're not in the KEYGUARD state unless the screen off animation is

        // playing, in which case we want them to be visible since we're animating in the AOD UI and

        // will be switching to KEYGUARD shortly.

        if (mStatusBarStateController.getState() != StatusBarState.KEYGUARD

                && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {

            visible = false;

        }

        if (visible && mWakeUpCoordinator.isPulseExpanding()) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase { 
    DarkIconDispatcher mDarkIconDispatcher;

    @Mock

    StatusBarWindowController mStatusBarWindowController;

    @Mock

    UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    private NotificationIconAreaController mController;

    @Mock

    private Bubbles mBubbles;
@@ -87,7 +89,8 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase { 
                Optional.of(mBubbles),

                mDemoModeController,

                mDarkIconDispatcher,

                mStatusBarWindowController);

                mStatusBarWindowController,

                mUnlockedScreenOffAnimationController);

    }



    @Test