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

Merge "Fix notification stuck on AOD" into qt-r1-dev

Browse Source 
am: 08fcdd9877

Change-Id: I6da73ac460ae0994794137598be894cd391759a4
This commit is contained in:
Lucas Dupin
2019-06-26 12:07:24 -07:00
committed by android-build-merger
parent 9733e690f9 08fcdd9877
commit 8cb08c0d61
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); 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() { private void cancelPulsing() {
if (mPulseCallback != null) { if (mPulseCallback != null) {
if (DEBUG) Log.d(TAG, "Cancel pulsing"); if (DEBUG) Log.d(TAG, "Cancel pulsing");

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

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