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

Commit e4ba777a authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "Add CATEGORY_TYPED_OPENABLE for ACTION_SEND[_MULTIPLE]."

parents 9593f04f 28a815c7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8816,6 +8816,7 @@ package android.content { 
    field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE";

    field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";

    field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";

    field public static final java.lang.String CATEGORY_TYPED_OPENABLE = "android.intent.category.TYPED_OPENABLE";

    field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";

    field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE";

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9176,6 +9176,7 @@ package android.content { 
    field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE";

    field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";

    field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";

    field public static final java.lang.String CATEGORY_TYPED_OPENABLE = "android.intent.category.TYPED_OPENABLE";

    field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";

    field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE";

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8841,6 +8841,7 @@ package android.content { 
    field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE";

    field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";

    field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";

    field public static final java.lang.String CATEGORY_TYPED_OPENABLE = "android.intent.category.TYPED_OPENABLE";

    field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";

    field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE";

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

core/java/android/content/Intent.java

+15 −0
Original line number Diff line number Diff line
@@ -3482,6 +3482,21 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.INTENT_CATEGORY)

    public static final String CATEGORY_OPENABLE = "android.intent.category.OPENABLE";



    /**

     * Used to indicate that an intent filter can accept files which are not necessarily

     * openable by {@link ContentResolver#openFileDescriptor(Uri, String)}, but

     * at least streamable via

     * {@link ContentResolver#openTypedAssetFileDescriptor(Uri, String, Bundle)}

     * using one of the stream types exposed via

     * {@link ContentResolver#getStreamTypes(Uri, String)}.

     *

     * @see #ACTION_SEND

     * @see #ACTION_SEND_MULTIPLE

     */

    @SdkConstant(SdkConstantType.INTENT_CATEGORY)

    public static final String CATEGORY_TYPED_OPENABLE  =

            "android.intent.category.TYPED_OPENABLE";



    /**

     * To be used as code under test for framework instrumentation tests.

     */