Merge "Check that a bubble exists before reordering it" into udc-qpr-dev

2023-07-19 13:39:55 +00:00
parent 9c8423f708 36325fd9d7
commit 0706a81907
1 changed files with 4 additions and 1 deletions
@@ -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());
                }