Cleanup unused areas of NotifEntry and related
- Remove unused `noisy` member
- Remove unused Bubble getter
- Move unfortunate static constants to the bottom of the file where they
are less of a bother for comprehension
Test: atest
Change-Id: Id3875cd9a883070650530a86383e5ab69bf2c185
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
index 780c314..fe4fa90 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
@@ -39,7 +39,6 @@
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
-import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
/**
* A floating object on the screen that can post message updates.
@@ -141,15 +140,6 @@
mUserBadgedAppIcon = appIcon;
}
- /**
- * @return the {@link ExpandableNotificationRow} view to display notification content when the
- * bubble is expanded.
- */
- @Nullable
- public ExpandableNotificationRow getRowView() {
- return (mBubble != null) ? mBubble.getEntry().getRow() : null;
- }
-
/** Changes the dot's visibility to match the bubble view's state. */
void updateDotVisibility(boolean animate) {
updateDotVisibility(animate, null /* after */);
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 153fdda..71fc549 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
@@ -85,11 +85,6 @@
* clean this up in the future.
*/
public final class NotificationEntry {
- private static final long LAUNCH_COOLDOWN = 2000;
- private static final long REMOTE_INPUT_COOLDOWN = 500;
- private static final long INITIALIZATION_DELAY = 400;
- private static final long NOT_LAUNCHED_YET = -LAUNCH_COOLDOWN;
- private static final int COLOR_INVALID = 1;
private final String mKey;
private StatusBarNotification mSbn;
@@ -109,7 +104,6 @@
* TODO: Remove every member beneath this line if possible
*/
- public boolean noisy;
public StatusBarIconView icon;
public StatusBarIconView expandedIcon;
public StatusBarIconView centeredIcon;
@@ -965,4 +959,10 @@
this.index = index;
}
}
+
+ private static final long LAUNCH_COOLDOWN = 2000;
+ private static final long REMOTE_INPUT_COOLDOWN = 500;
+ private static final long INITIALIZATION_DELAY = 400;
+ private static final long NOT_LAUNCHED_YET = -LAUNCH_COOLDOWN;
+ private static final int COLOR_INVALID = 1;
}