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

Merge "Merge "Fix notification stuck on AOD" into qt-r1-dev am: 08fcdd9877 am: 8cb08c0d61"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-06-27 18:20:50 +00:00
committed by Android (Google) Code Review
parent 8565044651 88d331da18
commit 50a53c2d1e
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
View File

@@ -149,6 +149,14 @@ public class DozeScrimController implements StateListener {
mHandler.removeCallbacks(mPulseOut);
}
/**
* When pulsing, cancel any timeouts that would take you out of the pulsing state.
*/
public void cancelPendingPulseTimeout() {
mHandler.removeCallbacks(mPulseOut);
mHandler.removeCallbacks(mPulseOutExtended);
}
private void cancelPulsing() {
if (mPulseCallback != null) {
if (DEBUG) Log.d(TAG, "Cancel pulsing");

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

@@ -1566,9 +1566,10 @@ public class StatusBar extends SystemUI implements DemoMode,
@Override
public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) {
mEntryManager.updateNotifications();
if (isDozing()) {
if (isHeadsUp) {
mDozeServiceHost.fireNotificationPulse();
if (isDozing() && isHeadsUp) {
mDozeServiceHost.fireNotificationPulse();
if (mPulsing) {
mDozeScrimController.cancelPendingPulseTimeout();
}
}
if (!isHeadsUp && !mHeadsUpManager.hasNotifications()) {