Merge "Check that a bubble exists before reordering it" into udc-qpr-dev am: 0706a81907

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24119403

Change-Id: I0cba344c8834f1cf3c2e9a172b38bb1255c5534f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liran Binyamin
2023-07-19 14:46:37 +00:00
committed by Automerger Merge Worker
@@ -306,7 +306,10 @@ public class BubbleBarView extends FrameLayout {
if (!isExpanded()) {
for (int i = 0; i < viewOrder.size(); i++) {
View child = viewOrder.get(i);
if (child != null) {
// this child view may have already been removed so verify that it still exists
// before reordering it, otherwise it will be re-added.
int indexOfChild = indexOfChild(child);
if (child != null && indexOfChild >= 0) {
removeViewInLayout(child);
addViewInLayout(child, i, child.getLayoutParams());
}