Merge "Support Slice type in SliceData"

src/com/android/settings/core/BasePreferenceController.java

@@ -20,6 +20,7 @@ import android.util.Log;
 
 import com.android.settings.search.ResultPayload;
 import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.slices.SliceData;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -153,6 +154,14 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
         return getAvailabilityStatus() != DISABLED_UNSUPPORTED;
     }
 
+    /**
+     * @return the UI type supported by the controller.
+     */
+    @SliceData.SliceType
+    public int getSliceType() {
+        return SliceData.SliceType.INTENT;
+    }
+
     /**
      * Updates non-indexable keys for search provider.
      *

src/com/android/settings/core/TogglePreferenceController.java

@@ -17,6 +17,7 @@ import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.TwoStatePreference;
 
+import com.android.settings.slices.SliceData;
 import com.android.settings.widget.MasterSwitchPreference;
 
 /**
@@ -59,4 +60,11 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle
     public final boolean onPreferenceChange(Preference preference, Object newValue) {
         return setChecked((Boolean) newValue);
     }
+
+    @Override
+    @SliceData.SliceType
+    public int getSliceType() {
+        return SliceData.SliceType.SWITCH;
+    }
+
 }