commit | 7f3d5253008ee574714900233f315a3f15d1e201 | [log] [tgz] |
---|---|---|
author | Lyn <lynhan@google.com> | Wed Jan 17 22:55:26 2024 +0000 |
committer | Lyn <lynhan@google.com> | Wed Jan 17 23:48:27 2024 +0000 |
tree | 5eee31b7ca5400cd2a480f3b391f9bd0184e6725 | |
parent | f04f3bdfd6ed105ebb8e99f14048d1f7be2a7ea8 [diff] |
Rename NotificationEntry.isAlerting to isHeadsUpEntry Bug: 320753095 Test: SystemUITests Flag: none Change-Id: I35adedc87ddb7622ccf4f70c18d5b5fe938d0549
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 cfe9fbe..cdacb10 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
@@ -171,7 +171,7 @@ private int mBucket = BUCKET_ALERTING; @Nullable private Long mPendingAnimationDuration; private boolean mIsMarkedForUserTriggeredMovement; - private boolean mIsAlerting; + private boolean mIsHeadsUpEntry; public boolean mRemoteEditImeAnimatingAway; public boolean mRemoteEditImeVisible; @@ -965,12 +965,12 @@ mIsMarkedForUserTriggeredMovement = marked; } - public void setIsAlerting(boolean isAlerting) { - mIsAlerting = isAlerting; + public void setIsHeadsUpEntry(boolean isHeadsUpEntry) { + mIsHeadsUpEntry = isHeadsUpEntry; } - public boolean isAlerting() { - return mIsAlerting; + public boolean isHeadsUpEntry() { + return mIsHeadsUpEntry; } /** Set whether this notification is currently used to animate a launch. */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java index d9c5108..2fd0fe0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java
@@ -578,7 +578,7 @@ } public boolean isPulsing(NotificationEntry entry) { - return mPulsing && entry.isAlerting(); + return mPulsing && entry.isHeadsUpEntry(); } public void setPulsingRow(ExpandableNotificationRow row) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java index d07a4d0..1528c9b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java
@@ -328,7 +328,7 @@ mHeadsUpEntryMap.put(entry.getKey(), headsUpEntry); onEntryAdded(headsUpEntry); entry.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED); - entry.setIsAlerting(true); + entry.setIsHeadsUpEntry(true); } /**