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

Commit b57dd8ab authored by Selim Cinek's avatar Selim Cinek
Browse files

Made sure huns can show on the lock screen even when awake 

Previously we only showed them if the screen was dozing

Bug: 130327302
Test: atest SystemUITests
Change-Id: Ib8a0fa19f8031fd2cc213e156ff89dfd24ee6fa3
parent 03e64d64

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt

+15 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class NotificationWakeUpCoordinator @Inject constructor( 
        private val mContext: Context,

        private val mHeadsUpManagerPhone: HeadsUpManagerPhone,

        private val mStatusBarStateController: StatusBarStateController,

        private val mBypassController: KeyguardBypassController)

        private val bypassController: KeyguardBypassController)

    : OnHeadsUpChangedListener, StatusBarStateController.StateListener {



    private val mNotificationVisibility
@@ -67,6 +67,8 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    private var mWakingUp = false

    private val mEntrySetToClearWhenFinished = mutableSetOf<NotificationEntry>()

    private val mDozeParameters: DozeParameters;

    var fullyAwake: Boolean = false



    var willWakeUp = false

        set(value) {

            if (!value || mDozeAmount != 0.0f) {
@@ -75,7 +77,6 @@ class NotificationWakeUpCoordinator @Inject constructor( 
        }



    lateinit var iconAreaController : NotificationIconAreaController



    var pulsing: Boolean = false

        set(value) {

            field = value
@@ -118,8 +119,15 @@ class NotificationWakeUpCoordinator @Inject constructor( 


    private fun updateNotificationVisibility(animate: Boolean, increaseSpeed: Boolean) {

        // TODO: handle Lockscreen wakeup for bypass when we're not pulsing anymore

        var visible = (mNotificationsVisibleForExpansion || mHeadsUpManagerPhone.hasNotifications())

                && pulsing

        var visible = mNotificationsVisibleForExpansion || mHeadsUpManagerPhone.hasNotifications()

        var canShow = pulsing

        if (bypassController.bypassEnabled) {

            // We also allow pulsing on the lock screen!

            canShow = canShow || (mWakingUp || willWakeUp || fullyAwake)

                            && mStatusBarStateController.state == StatusBarState.KEYGUARD

        }

        visible = visible && canShow



        if (!visible && mNotificationsVisible && (mWakingUp || willWakeUp) && mDozeAmount != 0.0f) {

            // let's not make notifications invisible while waking up, otherwise the animation

            // is strange
@@ -173,7 +181,7 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    }



    private fun updateDozeAmountIfBypass(): Boolean {

        if (mBypassController.bypassEnabled) {

        if (bypassController.bypassEnabled) {

            var amount = 1.0f;

            if (mStatusBarStateController.state == StatusBarState.SHADE

                    || mStatusBarStateController.state == StatusBarState.SHADE_LOCKED) {
@@ -247,7 +255,8 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    fun setWakingUp(wakingUp: Boolean) {

        willWakeUp = false

        mWakingUp = wakingUp

        if (wakingUp && mNotificationsVisible && !mNotificationsVisibleForExpansion) {

        if (wakingUp && mNotificationsVisible && !mNotificationsVisibleForExpansion

                && !bypassController.bypassEnabled) {

            // We're waking up while pulsing, let's make sure the animation looks nice

            mStackScroller.wakeUpFromPulse();

        }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+4 −0
Original line number Diff line number Diff line
@@ -660,6 +660,10 @@ public final class NotificationEntry { 
        return row != null && row.isHeadsUp();

    }



    public boolean showingPulsing() {

        return row != null && row.showingPulsing();

    }



    public void setHeadsUp(boolean shouldHeadsUp) {

        if (row != null) row.setHeadsUp(shouldHeadsUp);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -472,8 +472,8 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
            Runnable removeHeadsUpRunnable = () -> {

                if (!mVisualStabilityManager.isReorderingAllowed()

                        // We don't want to allow reordering while pulsing, but headsup need to

                        // time out if we're dozing.

                        && !mStatusBarStateController.isDozing()) {

                        // time out anyway

                        && !entry.showingPulsing()) {

                    mEntriesToRemoveWhenReorderingAllowed.add(entry);

                    mVisualStabilityManager.addReorderingAllowedCallback(

                            HeadsUpManagerPhone.this);

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

+2 −0
Original line number Diff line number Diff line
@@ -3621,6 +3621,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            updateNotificationPanelTouchState();

            notifyHeadsUpGoingToSleep();

            dismissVolumeDialog();

            mWakeUpCoordinator.setFullyAwake(false);

        }



        @Override
@@ -3643,6 +3644,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        @Override

        public void onFinishedWakingUp() {

            mWakeUpCoordinator.setFullyAwake(true);

            mWakeUpCoordinator.setWakingUp(false);

        }

    };