Merge "Add support for enabled state for SearchIndexableData"

1 files changed, 11 insertions, 3 deletions

diff --git a/core/java/android/provider/SearchIndexableData.java b/core/java/android/provider/SearchIndexableData.java
index 63818842672c..719dcead4382 100644
--- a/core/java/android/provider/SearchIndexableData.java
+++ b/core/java/android/provider/SearchIndexableData.java
@@ -21,15 +21,16 @@ import android.content.Context;
 import java.util.Locale;
 
 /**
- * The Indexable data for Search. This abstract class defines the common parts for all search
- * indexable data.
+ * The Indexable data for Search.
+ *
+ * This abstract class defines the common parts for all search indexable data.
  *
  * @hide
  */
 public abstract class SearchIndexableData {
 
     /**
-     * The context for the data. Will usually allow to retrieve some resources.
+     * The context for the data. Will usually allow retrieving some resources.
      *
      * @see Context
      */
@@ -41,6 +42,11 @@ public abstract class SearchIndexableData {
     public Locale locale;
 
     /**
+     * Tells if the data will be included into the search results. This is application specific.
+     */
+    public boolean enabled;
+
+    /**
      * The rank for the data. This is application specific.
      */
     public int rank;
@@ -103,6 +109,7 @@ public abstract class SearchIndexableData {
      * Default constructor.
      */
     public SearchIndexableData() {
+        enabled = true;
     }
 
     /**
@@ -113,5 +120,6 @@ public abstract class SearchIndexableData {
     public SearchIndexableData(Context ctx) {
         context = ctx;
         locale = Locale.getDefault();
+        enabled = true;
     }
 }