Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f92b7640 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Id077fb64a17cf11214755db443b165683fcc8934
parents cd6ace83 4d338c28

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -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);

        }

        }