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

Commit 5a31e0e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Intent#EXTRA_CONTENT_QUERY."

parents b7b483ad 710d1230

api/current.txt

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

    field public static final java.lang.String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";

    field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";

    field public static final java.lang.String EXTRA_CONTENT_QUERY = "android.intent.extra.CONTENT_QUERY";

    field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";

    field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";

    field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2

core/java/android/content/Intent.java

+11 −0
Original line number Diff line number Diff line
@@ -5228,6 +5228,17 @@ public class Intent implements Parcelable, Cloneable { 
     */

    public static final String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";



    /**

     * Optional CharSequence extra to provide a search query.

     *

     * <p>Applicable to {@link Intent} with actions:

     * <ul>

     *      <li>{@link Intent#ACTION_GET_CONTENT}</li>

     *      <li>{@link Intent#ACTION_OPEN_DOCUMENT}</li>

     * </ul>

     */

    public static final String EXTRA_CONTENT_QUERY = "android.intent.extra.CONTENT_QUERY";



    /**

     * Used as an int extra field in {@link #ACTION_MEDIA_RESOURCE_GRANTED}

     * intents to specify the resource type granted. Possible values are