Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed that we could be stuck with notifications pulse expanding

Browse Source 
We weren't properly reseting the pulse expanding state in the
bypass flow

Fixes: 133868650
Change-Id: Ibddac4a374f6eec990b11e80a824a02cfdd06f99
This commit is contained in:
Selim Cinek
2019-05-29 17:27:21 -07:00
parent ccb6ec86cd
commit 9a7520a393
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,11 +147,16 @@ class NotificationWakeUpCoordinator @Inject constructor(
// Let's notify the scroller that an animation started
notifyAnimationStart(mLinearDozeAmount == 1.0f)
}
setDozeAmount(linear, eased)
}
fun setDozeAmount(linear: Float, eased: Float) {
val changed = linear != mLinearDozeAmount
mLinearDozeAmount = linear
mDozeAmount = eased
mStackScroller.setDozeAmount(mDozeAmount)
updateDarkAmount()
if (linear == 0.0f) {
if (changed && linear == 0.0f) {
setNotificationsVisible(visible = false, animate = false, increaseSpeed = false);
setNotificationsVisibleForExpansion(visible = false, animate = false,
increaseSpeed = false)
@@ -164,16 +169,12 @@ class NotificationWakeUpCoordinator @Inject constructor(
private fun updateDozeAmountIfBypass(): Boolean {
if (mBypassController.bypassEnabled) {
var amount = 1.0f;
if (mStatusBarStateController.state == StatusBarState.SHADE
|| mStatusBarStateController.state == StatusBarState.SHADE_LOCKED) {
mDozeAmount = 0.0f
mLinearDozeAmount = 0.0f
} else {
mDozeAmount = 1.0f
mLinearDozeAmount = 1.0f
amount = 0.0f;
}
updateDarkAmount()
mStackScroller.setDozeAmount(mDozeAmount)
setDozeAmount(amount, amount)
return true
}
return false