diff options
5 files changed, 11 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index f98a88f5328b..e48c28d3f3ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -698,7 +698,7 @@ public final class NotificationEntry extends ListEntry implements NotificationRo } public void setHeadsUpIsVisible() { - if (row != null) row.setHeadsUpIsVisible(); + if (row != null) row.markHeadsUpSeen(); } //TODO: i'm imagining a world where this isn't just the row, but I could be rwong diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 582d847d5011..1cbb16e3983a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -859,8 +859,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } @Override - public void setHeadsUpIsVisible() { - super.setHeadsUpIsVisible(); + public void markHeadsUpSeen() { + super.markHeadsUpSeen(); mMustStayOnScreen = false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java index 2af119f98f4a..6becbd295264 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java @@ -637,7 +637,10 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro return false; } - public void setHeadsUpIsVisible() { + /** + * Called, when the notification has been seen by the user in the heads up state. + */ + public void markHeadsUpSeen() { } public boolean showingPulsing() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ExpandableViewState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ExpandableViewState.java index d1e5ab04a630..83de2265b98e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ExpandableViewState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ExpandableViewState.java @@ -176,7 +176,7 @@ public class ExpandableViewState extends ViewState { expandableView.setInShelf(inShelf); if (headsUpIsVisible) { - expandableView.setHeadsUpIsVisible(); + expandableView.markHeadsUpSeen(); } } } @@ -231,7 +231,7 @@ public class ExpandableViewState extends ViewState { expandableView.setInShelf(this.inShelf); if (headsUpIsVisible) { - expandableView.setHeadsUpIsVisible(); + expandableView.markHeadsUpSeen(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt index 52cb48be041f..8d73983e4053 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt @@ -51,8 +51,8 @@ constructor(private val viewModel: NotificationListViewModel) { } removed.forEach { key -> val row = obtainView(key) - parentView.generateHeadsUpAnimation(row, /* isHeadsUp = */ false) - row.setHeadsUpIsVisible() + parentView.generateHeadsUpAnimation(row, /* isHeadsUp= */ false) + row.markHeadsUpSeen() } } } |