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

Commit 949bf8e0 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Remove clipboard_shared_transition flag 

Has been rolled out, ready for cleanup

Bug: 409606539
Test: manual, atest ClipboardOverlayControllerTest
Flag: EXEMPT removing flag
Change-Id: I050893d1973a213f1a968444d0c206d3b5e91765
parent 8bee3cf3

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -665,16 +665,6 @@ flag { 
    }

}



flag {

    name: "clipboard_shared_transitions"

    namespace: "systemui"

    description: "Show shared transitions from clipboard"

    bug: "360843770"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "clipboard_use_description_mimetype"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+35 −129
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS; 


import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_ACTIONS;

import static com.android.systemui.Flags.clipboardAnnounceLiveRegion;

import static com.android.systemui.Flags.clipboardSharedTransitions;

import static com.android.systemui.Flags.showClipboardIndication;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_TAPPED;
@@ -116,60 +115,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
    private boolean mShowingUi;

    private boolean mIsMinimized;

    private ClipboardModel mClipboardModel;



    private final ClipboardOverlayView.ClipboardOverlayCallbacks mClipboardCallbacks =

            new ClipboardOverlayView.ClipboardOverlayCallbacks() {

                @Override

                public void onInteraction() {

                    if (mOnUiUpdate != null) {

                        mOnUiUpdate.run();

                    }

                }



                @Override

                public void onSwipeDismissInitiated(Animator animator) {

                    mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_SWIPE_DISMISSED);

                    mExitAnimator = animator;

                }



                @Override

                public void onDismissComplete() {

                    hideImmediate();

                }



                @Override

                public void onPreviewTapped() {

                    if (mOnPreviewTapped != null) {

                        mOnPreviewTapped.run();

                    }

                }



                @Override

                public void onShareButtonTapped() {

                    if (mOnShareTapped != null) {

                        mOnShareTapped.run();

                    }

                }



                @Override

                public void onRemoteCopyButtonTapped() {

                    if (mOnRemoteCopyTapped != null) {

                        mOnRemoteCopyTapped.run();

                    }

                }



                @Override

                public void onDismissButtonTapped() {

                    mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_DISMISS_TAPPED);

                    animateOut();

                }



                @Override

                public void onMinimizedViewTapped() {

                    animateFromMinimized();

                }

            };



    private ClipboardIndicationCallback mIndicationCallback = new ClipboardIndicationCallback() {

        @Override

        public void onIndicationTextChanged(@NonNull CharSequence text) {
@@ -215,11 +160,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
        mClipboardUtils = clipboardUtils;

        mBgExecutor = bgExecutor;



        if (clipboardSharedTransitions()) {

        mView.setCallbacks(this);

        } else {

            mView.setCallbacks(mClipboardCallbacks);

        }



        mWindow.withWindowAttached(() -> {

            mWindow.setContentView(mView);
@@ -227,25 +168,13 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                    mContext.getResources().getConfiguration().orientation);

        });



        mTimeoutHandler.setOnTimeoutRunnable(() -> {

            if (clipboardSharedTransitions()) {

                finish(CLIPBOARD_OVERLAY_TIMED_OUT);

            } else {

                mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_TIMED_OUT);

                animateOut();

            }

        });

        mTimeoutHandler.setOnTimeoutRunnable(() -> finish(CLIPBOARD_OVERLAY_TIMED_OUT));



        mCloseDialogsReceiver = new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                if (ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {

                    if (clipboardSharedTransitions()) {

                    finish(CLIPBOARD_OVERLAY_DISMISSED_OTHER);

                    } else {

                        mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_DISMISSED_OTHER);

                        animateOut();

                    }

                }

            }

        };
@@ -256,12 +185,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
            @Override

            public void onReceive(Context context, Intent intent) {

                if (SCREENSHOT_ACTION.equals(intent.getAction())) {

                    if (clipboardSharedTransitions()) {

                    finish(CLIPBOARD_OVERLAY_DISMISSED_OTHER);

                    } else {

                        mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_DISMISSED_OTHER);

                        animateOut();

                    }

                }

            }

        };
@@ -430,14 +354,9 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
            if (model.equals(mClipboardModel)) {

                remoteAction.ifPresent(action -> {

                    mClipboardLogger.logUnguarded(CLIPBOARD_OVERLAY_ACTION_SHOWN);

                    mView.post(() -> mView.setActionChip(action, () -> {

                        if (clipboardSharedTransitions()) {

                            finish(CLIPBOARD_OVERLAY_ACTION_TAPPED);

                        } else {

                            mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_ACTION_TAPPED);

                            animateOut();

                        }

                    }));

                    mView.post(

                            () -> mView.setActionChip(action,

                                    () -> finish(CLIPBOARD_OVERLAY_ACTION_TAPPED)));

                });

            }

        });
@@ -472,12 +391,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {

                    if (!mView.isInTouchRegion(

                            (int) motionEvent.getRawX(), (int) motionEvent.getRawY())) {

                        if (clipboardSharedTransitions()) {

                        finish(CLIPBOARD_OVERLAY_TAP_OUTSIDE);

                        } else {

                            mClipboardLogger.logSessionComplete(CLIPBOARD_OVERLAY_TAP_OUTSIDE);

                            animateOut();

                        }

                    }

                }

            }
@@ -644,22 +558,17 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 


    @Override

    public void onDismissButtonTapped() {

        if (clipboardSharedTransitions()) {

        finish(CLIPBOARD_OVERLAY_DISMISS_TAPPED);

    }

    }



    @Override

    public void onRemoteCopyButtonTapped() {

        if (clipboardSharedTransitions()) {

        finish(CLIPBOARD_OVERLAY_REMOTE_COPY_TAPPED,

                mIntentCreator.getRemoteCopyIntent(mClipboardModel.getClipData(), mContext));

    }

    }



    @Override

    public void onShareButtonTapped() {

        if (clipboardSharedTransitions()) {

        Intent shareIntent =

                mIntentCreator.getShareIntent(mClipboardModel.getClipData(), mContext);

        switch (mClipboardModel.getType()) {
@@ -672,11 +581,9 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                break;

        }

    }

    }



    @Override

    public void onPreviewTapped() {

        if (clipboardSharedTransitions()) {

        switch (mClipboardModel.getType()) {

            case TEXT:

                finish(CLIPBOARD_OVERLAY_EDIT_TAPPED,
@@ -693,7 +600,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                        + mClipboardModel.getType());

        }

    }

    }



    @Override

    public void onMinimizedViewTapped() {

packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardOverlayControllerTest.java

+0 −28
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.clipboardoverlay; 


import static android.content.res.Configuration.ORIENTATION_PORTRAIT;



import static com.android.systemui.Flags.FLAG_CLIPBOARD_SHARED_TRANSITIONS;

import static com.android.systemui.Flags.FLAG_SHOW_CLIPBOARD_INDICATION;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;

import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISS_TAPPED;
@@ -289,19 +288,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(FLAG_CLIPBOARD_SHARED_TRANSITIONS)

    public void test_viewCallbacks_onShareTapped_sharedTransitionsOff() {

        initController();

        mOverlayController.setClipData(mSampleClipData, "");



        mCallbacks.onShareButtonTapped();



        verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_SHARE_TAPPED, 0, "");

        verify(mClipboardOverlayView, times(1)).getExitAnimation();

    }



    @Test

    @EnableFlags(FLAG_CLIPBOARD_SHARED_TRANSITIONS)

    public void test_viewCallbacks_onShareTapped() {

        initController();

        mOverlayController.setClipData(mSampleClipData, "");
@@ -315,19 +301,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(FLAG_CLIPBOARD_SHARED_TRANSITIONS)

    public void test_viewCallbacks_onDismissTapped_sharedTransitionsOff() {

        initController();

        mOverlayController.setClipData(mSampleClipData, "");



        mCallbacks.onDismissButtonTapped();



        verify(mUiEventLogger, times(1)).log(CLIPBOARD_OVERLAY_DISMISS_TAPPED, 0, "");

        verify(mClipboardOverlayView, times(1)).getExitAnimation();

    }



    @Test

    @EnableFlags(FLAG_CLIPBOARD_SHARED_TRANSITIONS)

    public void test_viewCallbacks_onDismissTapped() {

        initController();
@@ -353,7 +326,6 @@ public class ClipboardOverlayControllerTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(FLAG_CLIPBOARD_SHARED_TRANSITIONS)

    public void test_multipleDismissals_dismissesOnce() {

        initController();