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

Merge "Fixed that we could be stuck with notifications pulse expanding" into qt-r1-dev

Browse Source
This commit is contained in:
Selim Cinek
2019-05-30 16:47:34 +00:00
committed by Android (Google) Code Review
parent a30f04be4e 9a7520a393
commit aab01138f7
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