Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58

Change-Id: I80c3e348b4882fb259c72cc1b87f0c89a1d501e9
This commit is contained in:
Automerger Merge Worker
2020-03-04 02:59:34 +00:00

View File

@@ -39,6 +39,7 @@ import com.android.settings.homepage.contextualcards.slices.FaceSetupSlice;
import com.android.settings.homepage.contextualcards.slices.LowStorageSlice; import com.android.settings.homepage.contextualcards.slices.LowStorageSlice;
import com.android.settings.homepage.contextualcards.slices.NotificationChannelSlice; import com.android.settings.homepage.contextualcards.slices.NotificationChannelSlice;
import com.android.settings.location.LocationSlice; import com.android.settings.location.LocationSlice;
import com.android.settings.media.MediaOutputGroupSlice;
import com.android.settings.media.MediaOutputIndicatorSlice; import com.android.settings.media.MediaOutputIndicatorSlice;
import com.android.settings.media.MediaOutputSlice; import com.android.settings.media.MediaOutputSlice;
import com.android.settings.media.RemoteMediaSlice; import com.android.settings.media.RemoteMediaSlice;
@@ -283,6 +284,16 @@ public class CustomSliceRegistry {
.appendPath(MediaOutputSliceConstants.KEY_MEDIA_OUTPUT) .appendPath(MediaOutputSliceConstants.KEY_MEDIA_OUTPUT)
.build(); .build();
/**
* Backing Uri for the Media output group Slice.
*/
public static Uri MEDIA_OUTPUT_GROUP_SLICE_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(MediaOutputSliceConstants.KEY_MEDIA_OUTPUT_GROUP)
.build();
/** /**
* Backing Uri for the Media output indicator Slice. * Backing Uri for the Media output indicator Slice.
*/ */
@@ -337,6 +348,7 @@ public class CustomSliceRegistry {
sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class); sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class);
sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class); sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class);
sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class); sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class);
sUriToSlice.put(MEDIA_OUTPUT_GROUP_SLICE_URI, MediaOutputGroupSlice.class);
} }
public static Class<? extends CustomSliceable> getSliceClassByUri(Uri uri) { public static Class<? extends CustomSliceable> getSliceClassByUri(Uri uri) {