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

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

Merge "Add a FLAG_ARCHIVE flag to DocumentsContract."

parents 1d4775fb a4c338ae

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30439,6 +30439,7 @@ package android.provider { 
    field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";

    field public static final java.lang.String COLUMN_SIZE = "_size";

    field public static final java.lang.String COLUMN_SUMMARY = "summary";

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

    field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10

    field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20

    field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32454,6 +32454,7 @@ package android.provider { 
    field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";

    field public static final java.lang.String COLUMN_SIZE = "_size";

    field public static final java.lang.String COLUMN_SUMMARY = "summary";

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

    field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10

    field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20

    field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30441,6 +30441,7 @@ package android.provider { 
    field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";

    field public static final java.lang.String COLUMN_SIZE = "_size";

    field public static final java.lang.String COLUMN_SUMMARY = "summary";

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

    field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10

    field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20

    field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8

core/java/android/provider/DocumentsContract.java

+13 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ public final class DocumentsContract { 
         * @see #FLAG_DIR_PREFERS_GRID

         * @see #FLAG_DIR_PREFERS_LAST_MODIFIED

         * @see #FLAG_VIRTUAL_DOCUMENT

         * @see #FLAG_ARCHIVE

         */

        public static final String COLUMN_FLAGS = "flags";
@@ -367,6 +368,18 @@ public final class DocumentsContract { 
         */

        public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 10;



        /**

         * Flag indicating that a document is an archive, and it's contents can be

         * obtained via {@link DocumentsProvider#queryChildDocuments}.

         * <p>

         * The <em>provider</em> support library offers utility classes to add common

         * archive support.

         *

         * @see #COLUMN_FLAGS

         * @see DocumentsProvider#queryChildDocuments(String, String[], String)

         */

        public static final int FLAG_ARCHIVE = 1 << 11;



        /**

         * Flag indicating that document titles should be hidden when viewing

         * this directory in a larger format grid. For example, a directory