commit 0826307c1b0d2b7d551fdcdb755b6fd80c6bfe7c
author Miranda Kephart <mkephart@google.com> Fri May 13 17:54:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 13 17:54:38 2022 +0000
tree 0f8fc6ddd23e94424f2af49f81b744c16f77aa61
parent 9a44e7a4bfbde1badc61edcbeb4fbe791b43b75e
parent a8c561f49c86f108dc7509a0d919a5971a73d9ab

Merge "Move smart chips (if any) before capture more" into tm-dev am: 6ff8ee2c80 am: b687714991 am: a8c561f49c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349155

Change-Id: Ic37dd01db02bff066eb63758c7d1901f234d0273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
index 48bb2af..79939c8 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
@@ -820,7 +820,7 @@
                             animateDismissal();
                         });
                 actionChip.setAlpha(1);
-                mActionsView.addView(actionChip);
+                mActionsView.addView(actionChip, mActionsView.getChildCount() - 1);
                 mSmartChips.add(actionChip);
             }
         }