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

Commit 3a7ce7ae authored by Lyn Han's avatar Lyn Han
Browse files

Use max value from resources

Test: SystemUITests
Change-Id: I6c3d7a257547ebb0ec4bcf309d9ea1e97df0fc02
parent 5bac3f05
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import java.util.Objects;

import javax.inject.Inject;
import javax.inject.Singleton;
import com.android.systemui.R;

/**
 * Keeps track of active bubbles.
@@ -57,8 +58,6 @@ public class BubbleData {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "BubbleData" : TAG_BUBBLES;

    private static final int MAX_BUBBLES = 5;

    private static final Comparator<Bubble> BUBBLES_BY_SORT_KEY_DESCENDING =
            Comparator.comparing(BubbleData::sortKey).reversed();

@@ -115,6 +114,7 @@ public class BubbleData {
    private final List<Bubble> mBubbles;
    private Bubble mSelectedBubble;
    private boolean mExpanded;
    private final int mMaxBubbles;

    // State tracked during an operation -- keeps track of what listener events to dispatch.
    private Update mStateChange;
@@ -144,6 +144,7 @@ public class BubbleData {
        mContext = context;
        mBubbles = new ArrayList<>();
        mStateChange = new Update(mBubbles);
        mMaxBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_rendered);
    }

    public boolean hasBubbles() {
@@ -329,7 +330,7 @@ public class BubbleData {
    }

    private void trim() {
        if (mBubbles.size() > MAX_BUBBLES) {
        if (mBubbles.size() > mMaxBubbles) {
            mBubbles.stream()
                    // sort oldest first (ascending lastActivity)
                    .sorted(Comparator.comparingLong(Bubble::getLastActivity))