commit d4e7782d75cb674a4c179a88cf8df36ebe00957f
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 30 17:03:24 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 30 17:03:24 2020 +0000
tree c921cbb4a13338204e11ed895cd5c2f8ef20340a
parent 103dfd8816c62ffc92b7848e06d1147804e37715
parent a13250e92774534f09957c3cf946491b03b300bb

Merge "Remove SetData from ImageApiImpl for sharing image." into ub-launcher3-master

quickstep/src/com/android/quickstep/util/ImageActionUtils.java

diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
index 7760255..f5fbf28 100644
--- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
+++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -21,6 +21,8 @@
 
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
+import android.content.ClipData;
+import android.content.ClipDescription;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -152,13 +154,16 @@
         if (intent == null) {
             intent = new Intent();
         }
+        ClipData clipdata = new ClipData(new ClipDescription("content",
+                new String[]{ClipDescription.MIMETYPE_TEXT_PLAIN}),
+                new ClipData.Item(uri));
         intent.setAction(Intent.ACTION_SEND)
                 .setComponent(null)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 .setType("image/png")
-                .setData(uri)
                 .setFlags(FLAG_GRANT_READ_URI_PERMISSION)
-                .putExtra(Intent.EXTRA_STREAM, uri);
+                .putExtra(Intent.EXTRA_STREAM, uri)
+                .setClipData(clipdata);
         return new Intent[]{Intent.createChooser(intent, null).addFlags(FLAG_ACTIVITY_NEW_TASK)};
     }
 }