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

Commit 624d6caf authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a bug where notifications could be invisible while pulsing 

We're now splitting the ambient logic from pulsing, and therefore
have multiple signals that can determine the notification visibility
independently. Previously the two were overlapping leading to invisible
pulsing notifications while the user was dragging down and up.

Test: atest SystemUiTests
Bug: 125942236
Change-Id: I3d6a6f77a1b2943d1c98cefa30a6eadb8519d5ef
parent 5040f2e6

packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt

+8 −12
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ import kotlin.math.max 
@Singleton

class PulseExpansionHandler @Inject

constructor(context: Context,

            private val mWakeUpCoordinator: NotificationWakeUpCoordinator,

            private val mAmbientPulseManager: AmbientPulseManager) : Gefingerpoken {

            private val mWakeUpCoordinator: NotificationWakeUpCoordinator) : Gefingerpoken {

    private val mPowerManager: PowerManager?

    private var mShadeController: ShadeController? = null
@@ -166,12 +165,10 @@ constructor(context: Context, 
            child.actualHeight = newHeight

            expansionHeight = max(newHeight.toFloat(), expansionHeight)

        } else {

            if (!mAmbientPulseManager.hasNotifications()) {

                // No pulsing notifications, we need to make notifications visible

            val target = if (mReachedWakeUpHeight) mWakeUpHeight else 0.0f

                mWakeUpCoordinator.setNotificationsVisible(height > target, true /* animate */,

            mWakeUpCoordinator.setNotificationsVisibleForExpansion(height > target,

                    true /* animate */,

                    true /* increaseSpeed */)

            }

            expansionHeight = max(mWakeUpHeight, expansionHeight)

        }

        val emptyDragAmount = mWakeUpCoordinator.setPulseHeight(expansionHeight)
@@ -231,10 +228,9 @@ constructor(context: Context, 
        } else {

            resetClock()

        }

        if (!mAmbientPulseManager.hasNotifications()) {

            mWakeUpCoordinator.setNotificationsVisible(false /* visible */, true /* animate */,

        mWakeUpCoordinator.setNotificationsVisibleForExpansion(false /* visible */,

                true /* animate */,

                false /* increaseSpeed */)

        }

        isExpanding = false

    }

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

+33 −11
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.util.FloatProperty 
import android.view.animation.Interpolator

import com.android.systemui.Interpolators

import com.android.systemui.statusbar.AmbientPulseManager

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

import com.android.systemui.statusbar.notification.stack.StackStateAnimator
@@ -29,7 +30,8 @@ import javax.inject.Singleton 


@Singleton

class NotificationWakeUpCoordinator @Inject constructor(

        private val mAmbientPulseManager: AmbientPulseManager) {

        private val mAmbientPulseManager: AmbientPulseManager)

    : AmbientPulseManager.OnAmbientChangedListener {



    private val mNotificationVisibility

            = object : FloatProperty<NotificationWakeUpCoordinator>("notificationVisibility") {
@@ -49,9 +51,15 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    private var mDozeAmount: Float = 0.0f

    private var mNotificationVisibleAmount = 0.0f

    private var mNotificationsVisible = false

    private var mNotificationsVisibleForExpansion = false

    private var mDarkAnimator: ObjectAnimator? = null

    private var mVisibilityAmount = 0.0f

    private var mLinearVisibilityAmount = 0.0f

    private var mPulsing: Boolean = false



    init {

        mAmbientPulseManager.addListener(this)

    }



    fun setStackScroller(stackScroller: NotificationStackScrollLayout) {

        mStackScroller = stackScroller
@@ -62,7 +70,22 @@ class NotificationWakeUpCoordinator @Inject constructor( 
     * @param animate should this change be animated

     * @param increaseSpeed should the speed be increased of the animation

     */

    fun setNotificationsVisible(visible: Boolean, animate: Boolean, increaseSpeed: Boolean) {

    fun setNotificationsVisibleForExpansion(visible: Boolean, animate: Boolean,

                                                    increaseSpeed: Boolean) {

        mNotificationsVisibleForExpansion = visible

        updateNotificationVisibility(animate, increaseSpeed)

    }



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

        var visible = false

        if (mPulsing) {

            visible = mNotificationsVisibleForExpansion || mAmbientPulseManager.hasNotifications()

        }

        setNotificationsVisible(visible, animate, increaseSpeed)

    }



    private fun setNotificationsVisible(visible: Boolean, animate: Boolean,

                                        increaseSpeed: Boolean) {

        if (mNotificationsVisible == visible) {

            return

        }
@@ -125,7 +148,8 @@ class NotificationWakeUpCoordinator @Inject constructor( 


    fun setDozing(dozing: Boolean, animate: Boolean) {

        if (dozing) {

            setNotificationsVisible(false /* animate */, false, true /* visible */ )

            mNotificationsVisible = false

            mNotificationsVisibleForExpansion = false

        }

        if (animate) {

            notifyAnimationStart(!dozing)
@@ -137,13 +161,11 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    }



    fun setPulsing(pulsing: Boolean) {

        val hasAmbientNotifications = mAmbientPulseManager.hasNotifications();

        if (pulsing && hasAmbientNotifications) {

            setNotificationsVisible(true /* visible */, true /* animate */,

                    false /* increaseSpeed */)

        } else if (!pulsing && !hasAmbientNotifications) {

            setNotificationsVisible(false /* visible */, true /* animate */,

                    false /* increaseSpeed */)

        mPulsing = pulsing;

        updateNotificationVisibility(animate = true, increaseSpeed = false)

    }



    override fun onAmbientStateChanged(entry: NotificationEntry?, isPulsing: Boolean) {

        updateNotificationVisibility(animate = true, increaseSpeed = false)

    }

}
 
 No newline at end of file