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

Commit 52a29573 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd215 

am: 9596d716

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
parents 58e291f1 9596d716

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9463,6 +9463,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";

    field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";

    field public static final java.lang.String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";

    field public static final java.lang.String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";

    field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";

    field public static final java.lang.String EXTRA_INDEX = "android.intent.extra.INDEX";

    field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10013,6 +10013,7 @@ package android.content { 
    field public static final deprecated java.lang.String EXTRA_EMERGENCY_ONLY = "emergencyOnly";

    field public static final java.lang.String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";

    field public static final java.lang.String EXTRA_FORCE_FACTORY_RESET = "android.intent.extra.FORCE_FACTORY_RESET";

    field public static final java.lang.String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";

    field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";

    field public static final java.lang.String EXTRA_INDEX = "android.intent.extra.INDEX";

    field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9497,6 +9497,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";

    field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";

    field public static final java.lang.String EXTRA_EXCLUDE_COMPONENTS = "android.intent.extra.EXCLUDE_COMPONENTS";

    field public static final java.lang.String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";

    field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";

    field public static final java.lang.String EXTRA_INDEX = "android.intent.extra.INDEX";

    field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";

core/java/android/content/Intent.java

+10 −0
Original line number Diff line number Diff line
@@ -656,6 +656,16 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_VIEW = "android.intent.action.VIEW";



    /**

     * Extra that can be included on activity intents coming from the storage UI

     * when it launches sub-activities to manage various types of storage.  For example,

     * it may use {@link #ACTION_VIEW} with a "image/*" MIME type to have an app show

     * the images on the device, and in that case also include this extra to tell the

     * app it is coming from the storage UI so should help the user manage storage of

     * this type.

     */

    public static final String EXTRA_FROM_STORAGE = "android.intent.extra.FROM_STORAGE";



    /**

     * A synonym for {@link #ACTION_VIEW}, the "standard" action that is

     * performed on a piece of data.