Merge "Add info about the overflow state changing / showing to bubble bar" into main (ec0db2c3) · Commits · e / os / android_frameworks_base

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);
		}

		/**