Merge "Add keywords to Slices" into pi-dev am: 2f911e2e9e

am: 21521826d9

Change-Id: I38d9efabcdecf3c40f1af28ecd167e58c2586ca7

src/com/android/settings/slices/SliceData.java

@@ -22,6 +22,7 @@ import android.text.TextUtils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.List;
 
 /**
  * Data class representing a slice stored by {@link SlicesIndexer}.
@@ -59,6 +60,8 @@ public class SliceData {
 
     private final CharSequence mScreenTitle;
 
+    private final String mKeywords;
+
     private final int mIconResource;
 
     private final String mFragmentClassName;
@@ -88,6 +91,10 @@ public class SliceData {
         return mScreenTitle;
     }
 
+    public String getKeywords() {
+        return mKeywords;
+    }
+
     public int getIconResource() {
         return mIconResource;
     }
@@ -117,6 +124,7 @@ public class SliceData {
         mTitle = builder.mTitle;
         mSummary = builder.mSummary;
         mScreenTitle = builder.mScreenTitle;
+        mKeywords = builder.mKeywords;
         mIconResource = builder.mIconResource;
         mFragmentClassName = builder.mFragmentClassName;
         mUri = builder.mUri;
@@ -148,6 +156,8 @@ public class SliceData {
 
         private CharSequence mScreenTitle;
 
+        private String mKeywords;
+
         private int mIconResource;
 
         private String mFragmentClassName;
@@ -180,6 +190,11 @@ public class SliceData {
             return this;
         }
 
+        public Builder setKeywords(String keywords) {
+            mKeywords = keywords;
+            return this;
+        }
+
         public Builder setIcon(int iconResource) {
             mIconResource = iconResource;
             return this;