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

Commit 931ff8d6 authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Export jetpack code to framework."

parents ff39326f df611335

apex/appsearch/framework/java/android/app/appsearch/AppSearchSchema.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -183,8 +183,9 @@ public final class AppSearchSchema { 
        public static final int DATA_TYPE_BYTES = 5;

        public static final int DATA_TYPE_BYTES = 5;





        /**

        /**

         * Indicates that the property itself is an Document, making it part a hierarchical Document

         * Indicates that the property is itself a {@link GenericDocument}, making it part of a

         * schema. Any property using this DataType MUST have a valid {@code schemaType}.

         * hierarchical schema. Any property using this DataType MUST have a valid {@link

         * PropertyConfig#getSchemaType}.

         */

         */

        public static final int DATA_TYPE_DOCUMENT = 6;

        public static final int DATA_TYPE_DOCUMENT = 6;
@@ -231,8 +232,8 @@ public final class AppSearchSchema { 
         * Content in this property will not be tokenized or indexed.

         * Content in this property will not be tokenized or indexed.

         *

         *

         * <p>Useful if the data type is not made up of terms (e.g. {@link

         * <p>Useful if the data type is not made up of terms (e.g. {@link

         * PropertyConfig#DATA_TYPE_DOCUMENT} or {@link PropertyConfig#DATA_TYPE_BYTES} type). All

         * PropertyConfig#DATA_TYPE_DOCUMENT} or {@link PropertyConfig#DATA_TYPE_BYTES} type). None

         * the properties inside the nested property won't be indexed regardless of the value of

         * of the properties inside the nested property will be indexed regardless of the value of

         * {@code indexingType} for the nested properties.

         * {@code indexingType} for the nested properties.

         */

         */

        public static final int INDEXING_TYPE_NONE = 0;

        public static final int INDEXING_TYPE_NONE = 0;

apex/appsearch/synced_jetpack_changeid.txt

+1 −1
Original line number Original line Diff line number Diff line 
Iac5514634d17fbe20e1dda04df5ee27a22e89304
 
I2decd83fab4c4d58fe38c9970f804046479c942c