Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add clipboard source to edit image intent" into tm-dev am: 0c44208351 am: 2a2992a3fc

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

Change-Id: I8d9cc44a41aaadc301eceb8593d9380c4df54c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2022-05-03 17:53:55 +00:00
committed by Automerger Merge Worker
parent 30cfdd6ba0 2a2992a3fc
commit f28e41cfd3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
View File

@@ -107,6 +107,8 @@ public class ClipboardOverlayController {
public static final String SELF_PERMISSION = "com.android.systemui.permission.SELF"; public static final String SELF_PERMISSION = "com.android.systemui.permission.SELF";
public static final String COPY_OVERLAY_ACTION = "com.android.systemui.COPY"; 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 CLIPBOARD_DEFAULT_TIMEOUT_MILLIS = 6000;
private static final int SWIPE_PADDING_DP = 12; // extra padding around views to allow swipe 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.setDataAndType(uri, "image/*");
editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
editIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); editIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
editIntent.putExtra(EXTRA_EDIT_SOURCE_CLIPBOARD, true);
mContext.startActivity(editIntent); mContext.startActivity(editIntent);
animateOut(); animateOut();
} }