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

Commit 21128ed1 authored by Mady Mellor's avatar Mady Mellor
Browse files

Add info about the overflow state changing / showing to bubble bar 

- Add the new bits to BubbleBarUpdate
- Include them in the state change

Test: none
Bug: 334175587
Change-Id: Iee94156b236f814a9363cf2182e333a1138a4162
parent c1513687

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ public class BubbleData { 
                    bubbleBarUpdate.bubbleKeysInOrder.add(bubbles.get(i).getKey());

                }

            }

            bubbleBarUpdate.showOverflowChanged = showOverflowChanged;

            bubbleBarUpdate.showOverflow = !overflowBubbles.isEmpty();

            return bubbleBarUpdate;

        }

libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/BubbleBarUpdate.java

+10 −1
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ public class BubbleBarUpdate implements Parcelable { 
    public BubbleBarLocation bubbleBarLocation;

    @Nullable

    public Point expandedViewDropTargetSize;

    public boolean showOverflowChanged;

    public boolean showOverflow;



    // This is only populated if bubbles have been removed.

    public List<RemovedBubble> removedBubbles = new ArrayList<>();
@@ -92,6 +94,8 @@ public class BubbleBarUpdate implements Parcelable { 
                BubbleBarLocation.class);

        expandedViewDropTargetSize = parcel.readParcelable(Point.class.getClassLoader(),

                Point.class);

        showOverflowChanged = parcel.readBoolean();

        showOverflow = parcel.readBoolean();

    }



    /**
@@ -107,7 +111,8 @@ public class BubbleBarUpdate implements Parcelable { 
                || suppressedBubbleKey != null

                || unsupressedBubbleKey != null

                || !currentBubbleList.isEmpty()

                || bubbleBarLocation != null;

                || bubbleBarLocation != null

                || showOverflowChanged;

    }



    @NonNull
@@ -128,6 +133,8 @@ public class BubbleBarUpdate implements Parcelable { 
                + " currentBubbleList=" + currentBubbleList

                + " bubbleBarLocation=" + bubbleBarLocation

                + " expandedViewDropTargetSize=" + expandedViewDropTargetSize

                + " showOverflowChanged=" + showOverflowChanged

                + " showOverflow=" + showOverflow

                + " }";

    }
@@ -152,6 +159,8 @@ public class BubbleBarUpdate implements Parcelable { 
        parcel.writeParcelableList(currentBubbleList, flags);

        parcel.writeParcelable(bubbleBarLocation, flags);

        parcel.writeParcelable(expandedViewDropTargetSize, flags);

        parcel.writeBoolean(showOverflowChanged);

        parcel.writeBoolean(showOverflow);

    }



    /**