From 72503d29bd63fb833ae3b43b2de8fcc8177ee6ba Mon Sep 17 00:00:00 2001 From: Xuanang Zhao Date: Wed, 19 Oct 2022 15:28:36 +0800 Subject: [PATCH] Clean up an unused slice and classify the custom slice usage. Test: maunal Bug: 249101421 Change-Id: I362995c114f65f0105b5e2b8036ecb886bd6663a --- .../settings/slices/CustomSliceRegistry.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java index 569a0eaac7f..1cc3276f1ce 100644 --- a/src/com/android/settings/slices/CustomSliceRegistry.java +++ b/src/com/android/settings/slices/CustomSliceRegistry.java @@ -315,37 +315,28 @@ public class CustomSliceRegistry { .appendPath("always_on_display") .build(); - /** - * Backing Uri for the Turn on Wi-Fi Slice. - */ - public static final Uri TURN_ON_WIFI_SLICE_URI = new Uri.Builder() - .scheme(ContentResolver.SCHEME_CONTENT) - .authority(SettingsSliceProvider.SLICE_AUTHORITY) - .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) - .appendPath("turn_on_wifi") - .build(); - @VisibleForTesting static final Map> sUriToSlice; static { sUriToSlice = new ArrayMap<>(); - - sUriToSlice.put(BATTERY_FIX_SLICE_URI, BatteryFixSlice.class); - sUriToSlice.put(BLUETOOTH_DEVICES_SLICE_URI, BluetoothDevicesSlice.class); - sUriToSlice.put(CONTEXTUAL_ADAPTIVE_SLEEP_URI, ContextualAdaptiveSleepSlice.class); - sUriToSlice.put(CONTEXTUAL_WIFI_SLICE_URI, ContextualWifiSlice.class); - sUriToSlice.put(FACE_ENROLL_SLICE_URI, FaceSetupSlice.class); sUriToSlice.put(FLASHLIGHT_SLICE_URI, FlashlightSlice.class); sUriToSlice.put(LOCATION_SLICE_URI, LocationSlice.class); - sUriToSlice.put(LOW_STORAGE_SLICE_URI, LowStorageSlice.class); - sUriToSlice.put(MEDIA_OUTPUT_INDICATOR_SLICE_URI, MediaOutputIndicatorSlice.class); sUriToSlice.put(MOBILE_DATA_SLICE_URI, MobileDataSlice.class); sUriToSlice.put(PROVIDER_MODEL_SLICE_URI, ProviderModelSlice.class); sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class); sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class); - sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class); sUriToSlice.put(ALWAYS_ON_SLICE_URI, AlwaysOnDisplaySlice.class); + sUriToSlice.put(MEDIA_OUTPUT_INDICATOR_SLICE_URI, MediaOutputIndicatorSlice.class); + sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class); + + // Slices for contextual card. + sUriToSlice.put(FACE_ENROLL_SLICE_URI, FaceSetupSlice.class); + sUriToSlice.put(BATTERY_FIX_SLICE_URI, BatteryFixSlice.class); + sUriToSlice.put(CONTEXTUAL_ADAPTIVE_SLEEP_URI, ContextualAdaptiveSleepSlice.class); + sUriToSlice.put(CONTEXTUAL_WIFI_SLICE_URI, ContextualWifiSlice.class); + sUriToSlice.put(LOW_STORAGE_SLICE_URI, LowStorageSlice.class); + sUriToSlice.put(BLUETOOTH_DEVICES_SLICE_URI, BluetoothDevicesSlice.class); } public static Class getSliceClassByUri(Uri uri) {