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

Merge "Reinstate the logtags event SYSUI_HEADS_UP_STATUS" into sc-dev am: 4d338c28dc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177738

Change-Id: Id077fb64a17cf11214755db443b165683fcc8934
This commit is contained in:
Jeff DeCew
2021-07-02 16:35:59 +00:00
committed by Automerger Merge Worker
parent cd6ace83bf 4d338c28dc
commit f92b764055
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
View File

@@ -33,6 +33,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLogger;
import com.android.systemui.Dependency; import com.android.systemui.Dependency;
import com.android.systemui.EventLogTags;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.statusbar.AlertingNotificationManager; import com.android.systemui.statusbar.AlertingNotificationManager;
import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntry;
@@ -175,6 +176,7 @@ public abstract class HeadsUpManager extends AlertingNotificationManager {
NotificationEntry entry = alertEntry.mEntry; NotificationEntry entry = alertEntry.mEntry;
entry.setHeadsUp(true); entry.setHeadsUp(true);
setEntryPinned((HeadsUpEntry) alertEntry, shouldHeadsUpBecomePinned(entry)); setEntryPinned((HeadsUpEntry) alertEntry, shouldHeadsUpBecomePinned(entry));
EventLogTags.writeSysuiHeadsUpStatus(entry.getKey(), 1 /* visible */);
for (OnHeadsUpChangedListener listener : mListeners) { for (OnHeadsUpChangedListener listener : mListeners) {
listener.onHeadsUpStateChanged(entry, true); listener.onHeadsUpStateChanged(entry, true);
} }
@@ -185,6 +187,7 @@ public abstract class HeadsUpManager extends AlertingNotificationManager {
NotificationEntry entry = alertEntry.mEntry; NotificationEntry entry = alertEntry.mEntry;
entry.setHeadsUp(false); entry.setHeadsUp(false);
setEntryPinned((HeadsUpEntry) alertEntry, false /* isPinned */); setEntryPinned((HeadsUpEntry) alertEntry, false /* isPinned */);
EventLogTags.writeSysuiHeadsUpStatus(entry.getKey(), 0 /* visible */);
for (OnHeadsUpChangedListener listener : mListeners) { for (OnHeadsUpChangedListener listener : mListeners) {
listener.onHeadsUpStateChanged(entry, false); listener.onHeadsUpStateChanged(entry, false);
} }