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

Commit 89121f35 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Remove old quickshare chip when adding a new one" into tm-qpr-dev am:... 

Merge "Remove old quickshare chip when adding a new one" into tm-qpr-dev am: 2e5bc091 am: 078a1bdb

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



Change-Id: If0019cdc7a8f3e3dfd16690cbec3190a3967f727
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9da119ae 078a1bdb

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

+7 −0
Original line number Diff line number Diff line
@@ -881,6 +881,13 @@ public class ScreenshotView extends FrameLayout implements 
    }



    void addQuickShareChip(Notification.Action quickShareAction) {

        if (mQuickShareChip != null) {

            mSmartChips.remove(mQuickShareChip);

            mActionsView.removeView(mQuickShareChip);

        }

        if (mPendingInteraction == PendingInteraction.QUICK_SHARE) {

            mPendingInteraction = null;

        }

        if (mPendingInteraction == null) {

            LayoutInflater inflater = LayoutInflater.from(mContext);

            mQuickShareChip = (OverlayActionChip) inflater.inflate(