Merge "Add an extra to pass initial location URI for file choosers." (00c2ed26) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -32077,6 +32077,7 @@ package android.provider {
		field public static final java.lang.String EXTRA_LOADING = "loading";
		field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";
		field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
		}

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -34740,6 +34740,7 @@ package android.provider {
		field public static final java.lang.String EXTRA_LOADING = "loading";
		field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";
		field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
		}

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -32163,6 +32163,7 @@ package android.provider {
		field public static final java.lang.String EXTRA_LOADING = "loading";
		field public static final java.lang.String EXTRA_ORIENTATION = "android.provider.extra.ORIENTATION";
		field public static final java.lang.String EXTRA_PROMPT = "android.provider.extra.PROMPT";
		field public static final java.lang.String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";
		field public static final java.lang.String PROVIDER_INTERFACE = "android.content.action.DOCUMENTS_PROVIDER";
		}

core/java/android/content/Intent.java

+15 −12

Original line number	Diff line number	Diff line
		@@ -3120,10 +3120,11 @@ public class Intent implements Parcelable, Cloneable {
		* URIs that can be opened with
		* {@link ContentResolver#openFileDescriptor(Uri, String)}.
		* <p>
		* Callers can set a document URI through {@link #setData(Uri)} to indicate
		* the initial location of documents navigator. System will do its best to
		* launch the navigator in the specified document if it's a folder, or the
		* folder that contains the specified document if not.
		* Callers can set a document URI through
		* {@link DocumentsContract#EXTRA_INITIAL_URI} to indicate the initial
		* location of documents navigator. System will do its best to launch the
		* navigator in the specified document if it's a folder, or the folder that
		* contains the specified document if not.
		* <p>
		* Output: The URI of the item that was picked, returned in
		* {@link #getData()}. This must be a {@code content://} URI so that any
		@@ -3161,10 +3162,11 @@ public class Intent implements Parcelable, Cloneable {
		* URIs that can be opened with
		* {@link ContentResolver#openFileDescriptor(Uri, String)}.
		* <p>
		* Callers can set a document URI through {@link #setData(Uri)} to indicate
		* the initial location of documents navigator. System will do its best to
		* launch the navigator in the specified document if it's a folder, or the
		* folder that contains the specified document if not.
		* Callers can set a document URI through
		* {@link DocumentsContract#EXTRA_INITIAL_URI} to indicate the initial
		* location of documents navigator. System will do its best to launch the
		* navigator in the specified document if it's a folder, or the folder that
		* contains the specified document if not.
		* <p>
		* Output: The URI of the item that was created. This must be a
		* {@code content://} URI so that any receiver can access it.
		@@ -3188,10 +3190,11 @@ public class Intent implements Parcelable, Cloneable {
		* {@link DocumentsContract#buildChildDocumentsUriUsingTree(Uri, String)}
		* with the returned URI.
		* <p>
		* Callers can set a document URI through {@link #setData(Uri)} to indicate
		* the initial location of documents navigator. System will do its best to
		* initiate the navigator in the specified document if it's a folder, or
		* the folder that contains the specified document if not.
		* Callers can set a document URI through
		* {@link DocumentsContract#EXTRA_INITIAL_URI} to indicate the initial
		* location of documents navigator. System will do its best to launch the
		* navigator in the specified document if it's a folder, or the folder that
		* contains the specified document if not.
		* <p>
		* Output: The URI representing the selected directory tree.
		*

core/java/android/provider/DocumentsContract.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,22 @@ public final class DocumentsContract {
		/** {@hide} */
		public static final String EXTRA_TARGET_URI = "android.content.extra.TARGET_URI";

		/**
		* Sets the desired initial location visible to user when file chooser is shown.
		*
		* <p>Applicable to {@link Intent} with actions:
		* <ul>
		* <li>{@link Intent#ACTION_OPEN_DOCUMENT}</li>
		* <li>{@link Intent#ACTION_CREATE_DOCUMENT}</li>
		* <li>{@link Intent#ACTION_OPEN_DOCUMENT_TREE}</li>
		* </ul>
		*
		* <p>Location should specify a document URI or a tree URI with document ID. If
		* this URI identifies a non-directory, document navigator will attempt to use the parent
		* of the document as the initial location.
		*/
		public static final String EXTRA_INITIAL_URI = "android.provider.extra.INITIAL_URI";

		/**
		* Set this in a DocumentsUI intent to cause a package's own roots to be
		* excluded from the roots list.