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

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

Merge "Add clipboard source to edit image intent" into tm-dev am: 0c442083 am: d7cf4c90 

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



Change-Id: I238b1779f3036bc319c13774ed87b70906f7336c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5209043c d7cf4c90

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

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ public class ClipboardOverlayController { 
    public static final String SELF_PERMISSION = "com.android.systemui.permission.SELF";

    public static final String COPY_OVERLAY_ACTION = "com.android.systemui.COPY";



    private static final String EXTRA_EDIT_SOURCE_CLIPBOARD = "edit_source_clipboard";



    private static final int CLIPBOARD_DEFAULT_TIMEOUT_MILLIS = 6000;

    private static final int SWIPE_PADDING_DP = 12; // extra padding around views to allow swipe
@@ -391,6 +393,7 @@ public class ClipboardOverlayController { 
        editIntent.setDataAndType(uri, "image/*");

        editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        editIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

        editIntent.putExtra(EXTRA_EDIT_SOURCE_CLIPBOARD, true);

        mContext.startActivity(editIntent);

        animateOut();

    }