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

Commit ddb4bdec authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

Add extras to ClipDescription 

This is required to expand metadata capabilities of DragEvent.
Apps receiving ACTION_DRAG_* events have access to
ClipDescription, but not ClipData.

Adding extras to ClipDescription allows for a richer behavior of apps
responding to these events.

Bug: 25788641
Change-Id: I07e374f71d16f8441dc3a0b02c7d833e0139b74b
parent ec741671

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -7441,12 +7441,16 @@ package android.content { 
    method public static boolean compareMimeTypes(java.lang.String, java.lang.String);

    method public int describeContents();

    method public java.lang.String[] filterMimeTypes(java.lang.String);

    method public android.os.PersistableBundle getExtras();

    method public java.lang.CharSequence getLabel();

    method public java.lang.String getMimeType(int);

    method public int getMimeTypeCount();

    method public boolean hasMimeType(java.lang.String);

    method public void setExtras(android.os.PersistableBundle);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;

    field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";

    field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";

    field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";

    field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";

    field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -7682,12 +7682,16 @@ package android.content { 
    method public static boolean compareMimeTypes(java.lang.String, java.lang.String);

    method public int describeContents();

    method public java.lang.String[] filterMimeTypes(java.lang.String);

    method public android.os.PersistableBundle getExtras();

    method public java.lang.CharSequence getLabel();

    method public java.lang.String getMimeType(int);

    method public int getMimeTypeCount();

    method public boolean hasMimeType(java.lang.String);

    method public void setExtras(android.os.PersistableBundle);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;

    field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";

    field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";

    field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";

    field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";

    field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -7441,12 +7441,16 @@ package android.content { 
    method public static boolean compareMimeTypes(java.lang.String, java.lang.String);

    method public int describeContents();

    method public java.lang.String[] filterMimeTypes(java.lang.String);

    method public android.os.PersistableBundle getExtras();

    method public java.lang.CharSequence getLabel();

    method public java.lang.String getMimeType(int);

    method public int getMimeTypeCount();

    method public boolean hasMimeType(java.lang.String);

    method public void setExtras(android.os.PersistableBundle);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.content.ClipDescription> CREATOR;

    field public static final java.lang.String EXTRA_TARGET_COMPONENT_NAME = "android.content.extra.TARGET_COMPONENT_NAME";

    field public static final java.lang.String EXTRA_USER_SERIAL_NUMBER = "android.content.extra.USER_SERIAL_NUMBER";

    field public static final java.lang.String MIMETYPE_TEXT_HTML = "text/html";

    field public static final java.lang.String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";

    field public static final java.lang.String MIMETYPE_TEXT_PLAIN = "text/plain";

core/java/android/content/ClipDescription.java

+58 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.content; 


import android.os.Parcel;

import android.os.Parcelable;

import android.os.PersistableBundle;

import android.text.TextUtils;



import java.util.ArrayList;
@@ -59,8 +60,35 @@ public class ClipDescription implements Parcelable { 
     */

    public static final String MIMETYPE_TEXT_INTENT = "text/vnd.android.intent";



    /**

     * The name of the extra used to define a component name when copying/dragging

     * an app icon from Launcher.

     * <p>

     * Type: String

     * </p>

     * <p>

     * Use {@link ComponentName#unflattenFromString(String)}

     * and {@link ComponentName#flattenToString()} to convert the extra value

     * to/from {@link ComponentName}.

     * </p>

     */

    public static final String EXTRA_TARGET_COMPONENT_NAME =

            "android.content.extra.TARGET_COMPONENT_NAME";



    /**

     * The name of the extra used to define a user serial number when copying/dragging

     * an app icon from Launcher.

     * <p>

     * Type: long

     * </p>

     */

    public static final String EXTRA_USER_SERIAL_NUMBER =

            "android.content.extra.USER_SERIAL_NUMBER";





    final CharSequence mLabel;

    final String[] mMimeTypes;

    private PersistableBundle mExtras;



    /**

     * Create a new clip.
@@ -173,6 +201,27 @@ public class ClipDescription implements Parcelable { 
        return mMimeTypes[index];

    }



    /**

     * Retrieve extended data from the clip description.

     *

     * @return the bundle containing extended data previously set with

     * {@link #setExtras(PersistableBundle)}, or null if no extras have been set.

     *

     * @see #setExtras(PersistableBundle)

     */

    public PersistableBundle getExtras() {

        return mExtras;

    }



    /**

     * Add extended data to the clip description.

     *

     * @see #getExtras()

     */

    public void setExtras(PersistableBundle extras) {

        mExtras = new PersistableBundle(extras);

    }



    /** @hide */

    public void validate() {

        if (mMimeTypes == null) {
@@ -211,6 +260,13 @@ public class ClipDescription implements Parcelable { 
            b.append(mLabel);

            b.append('"');

        }

        if (mExtras != null) {

            if (!first) {

                b.append(' ');

            }

            first = false;

            b.append(mExtras.toString());

        }

        return !first;

    }
@@ -236,11 +292,13 @@ public class ClipDescription implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

        TextUtils.writeToParcel(mLabel, dest, flags);

        dest.writeStringArray(mMimeTypes);

        dest.writePersistableBundle(mExtras);

    }



    ClipDescription(Parcel in) {

        mLabel = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        mMimeTypes = in.createStringArray();

        mExtras = in.readPersistableBundle();

    }



    public static final Parcelable.Creator<ClipDescription> CREATOR =