From 1f05141c82ad8ee24d4afbbd17b5562e6005f32d Mon Sep 17 00:00:00 2001 From: AndrĂ¡s Kurucz Date: Wed, 6 Mar 2024 18:25:13 +0000 Subject: Remove AmbientState.hasPulsingNotifications() This code was unused, and t would allow us to clean up more things. Bug: 325936094 Test: atest SystemUITests Flag: None Change-Id: I0eaf76f944cd1135c76156e4f8e6cbd9e0b604b7 --- .../systemui/statusbar/notification/stack/AmbientState.java | 11 ----------- .../notification/stack/NotificationStackScrollLayout.java | 7 ------- .../stack/NotificationStackScrollLayoutController.java | 2 -- 3 files changed, 20 deletions(-) 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 ab2f664fee88..ac44b3e4f1f2 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 @@ -262,9 +262,6 @@ public class AmbientState implements Dumpable { return mStackHeight; } - /** Tracks the state from HeadsUpManager#hasNotifications() */ - private boolean mHasHeadsUpEntries; - @Inject public AmbientState( @NonNull Context context, @@ -547,10 +544,6 @@ public class AmbientState implements Dumpable { mPanelTracking = panelTracking; } - public boolean hasPulsingNotifications() { - return mPulsing && mHasHeadsUpEntries; - } - public void setPulsing(boolean hasPulsing) { mPulsing = hasPulsing; } @@ -701,10 +694,6 @@ public class AmbientState implements Dumpable { return mAppearFraction; } - public void setHasHeadsUpEntries(boolean hasHeadsUpEntries) { - mHasHeadsUpEntries = hasHeadsUpEntries; - } - public void setStackTopMargin(int stackTopMargin) { mStackTopMargin = stackTopMargin; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index b47b18d4512d..38f21eebea41 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -5379,13 +5379,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable mTopHeadsUpRow = topHeadsUpRow; } - /** - * @param numHeadsUp the number of active alerting notifications. - */ - public void setNumHeadsUp(long numHeadsUp) { - mAmbientState.setHasHeadsUpEntries(numHeadsUp > 0); - } - public boolean getIsExpanded() { return mIsExpanded; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 3bdd0e9920c0..382de3fd6dac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -689,9 +689,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { @Override public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) { - long numEntries = mHeadsUpManager.getAllEntries().count(); NotificationEntry topEntry = mHeadsUpManager.getTopEntry(); - mView.setNumHeadsUp(numEntries); mView.setTopHeadsUpRow(topEntry != null ? topEntry.getRow() : null); generateHeadsUpAnimation(entry, isHeadsUp); } -- cgit v1.2.3-59-g8ed1b