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

Commit e7b416e4 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Add DocumentsContract#ACTION_DOCUMENT_SETTINGS and Documents#FLAG_SUPPORTS_SETTINGS."

parents f41d429c bd036d82

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -32418,6 +32418,7 @@ package android.provider { 
    method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri);

    method public static boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);

    method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);

    field public static final java.lang.String ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";

    field public static final java.lang.String EXTRA_ERROR = "error";

    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

    field public static final java.lang.String EXTRA_INFO = "info";
@@ -32445,6 +32446,7 @@ package android.provider { 
    field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100

    field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400

    field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40

    field public static final int FLAG_SUPPORTS_SETTINGS = 2048; // 0x800

    field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1

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

    field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35122,6 +35122,7 @@ package android.provider { 
    method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri);

    method public static boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);

    method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);

    field public static final java.lang.String ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";

    field public static final java.lang.String EXTRA_ERROR = "error";

    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

    field public static final java.lang.String EXTRA_INFO = "info";
@@ -35149,6 +35150,7 @@ package android.provider { 
    field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100

    field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400

    field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40

    field public static final int FLAG_SUPPORTS_SETTINGS = 2048; // 0x800

    field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1

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

    field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -32531,6 +32531,7 @@ package android.provider { 
    method public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri);

    method public static boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri);

    method public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, java.lang.String);

    field public static final java.lang.String ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";

    field public static final java.lang.String EXTRA_ERROR = "error";

    field public static final java.lang.String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

    field public static final java.lang.String EXTRA_INFO = "info";
@@ -32558,6 +32559,7 @@ package android.provider { 
    field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100

    field public static final int FLAG_SUPPORTS_REMOVE = 1024; // 0x400

    field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40

    field public static final int FLAG_SUPPORTS_SETTINGS = 2048; // 0x800

    field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1

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

    field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200

core/java/android/provider/DocumentsContract.java

+25 −0
Original line number Diff line number Diff line
@@ -140,6 +140,23 @@ public final class DocumentsContract { 
     */

    public static final String EXTRA_PROMPT = "android.provider.extra.PROMPT";



    /**

     * Action of intent issued by DocumentsUI when user wishes to open/configure/manage a particular

     * document in the provider application.

     * 

     * <p>When issued, the intent will include the URI of the document as the intent data.

     * 

     * <p>A provider wishing to provide support for this action should do two things.

     * <li>Add an {@code <intent-filter>} matching this action.

     * <li>When supplying information in {@link DocumentsProvider#queryChildDocuments}, include

     * {@link Document#FLAG_SUPPORTS_SETTINGS} in the flags for each document that supports

     * settings.

     *

     * @see DocumentsContact#Document#FLAG_SUPPORTS_SETTINGS

     */

    public static final String

            ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";



    /** {@hide} */

    public static final String ACTION_MANAGE_DOCUMENT = "android.provider.action.MANAGE_DOCUMENT";
@@ -393,6 +410,14 @@ public final class DocumentsContract { 
         */

        public static final int FLAG_SUPPORTS_REMOVE = 1 << 10;



        /**

         * Flag indicating that a document has settings that can be configured by user.

         *

         * @see #COLUMN_FLAGS

         * @see #ACTION_DOCUMENT_SETTINGS

         */

        public static final int FLAG_SUPPORTS_SETTINGS = 1 << 11;



        /**

         * Flag indicating that a document is not complete, likely its

         * contents are being downloaded. Partial files cannot be opened,