PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the ZenModeSliceBuilder" into main

Browse Source
This commit is contained in:
Alexander Roederer
2024-08-08 11:35:11 +00:00
committed by Android (Google) Code Review
parent 221a8852dd 3d0dcda008
commit 22677304c9
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -120,6 +120,16 @@ public class SettingsSliceProvider extends SliceProvider {
* permission can use them. * permission can use them.
*/ */
private static final List<Uri> PUBLICLY_SUPPORTED_CUSTOM_SLICE_URIS = private static final List<Uri> PUBLICLY_SUPPORTED_CUSTOM_SLICE_URIS =
android.app.Flags.modesUi()
?
Arrays.asList(
CustomSliceRegistry.BLUETOOTH_URI,
CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
CustomSliceRegistry.LOCATION_SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
CustomSliceRegistry.WIFI_CALLING_URI,
CustomSliceRegistry.WIFI_SLICE_URI
) :
Arrays.asList( Arrays.asList(
CustomSliceRegistry.BLUETOOTH_URI, CustomSliceRegistry.BLUETOOTH_URI,
CustomSliceRegistry.FLASHLIGHT_SLICE_URI, CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
@@ -184,7 +194,9 @@ public class SettingsSliceProvider extends SliceProvider {
} }
if (CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) { if (CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) {
if (!android.app.Flags.modesUi()) {
registerIntentToUri(ZenModeSliceBuilder.INTENT_FILTER, sliceUri); registerIntentToUri(ZenModeSliceBuilder.INTENT_FILTER, sliceUri);
}
return; return;
} else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) { } else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) {
registerIntentToUri(BluetoothSliceBuilder.INTENT_FILTER, sliceUri); registerIntentToUri(BluetoothSliceBuilder.INTENT_FILTER, sliceUri);
@@ -256,7 +268,8 @@ public class SettingsSliceProvider extends SliceProvider {
.getSlicesFeatureProvider() .getSlicesFeatureProvider()
.getNewWifiCallingSliceHelper(getContext()) .getNewWifiCallingSliceHelper(getContext())
.createWifiCallingSlice(sliceUri); .createWifiCallingSlice(sliceUri);
} else if (CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) { } else if (!android.app.Flags.modesUi()
&& CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) {
return ZenModeSliceBuilder.getSlice(getContext()); return ZenModeSliceBuilder.getSlice(getContext());
} else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) { } else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) {
return BluetoothSliceBuilder.getSlice(getContext()); return BluetoothSliceBuilder.getSlice(getContext());

9
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -30,7 +30,6 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -131,7 +130,13 @@ public class SettingsSliceProviderTest {
CustomSliceRegistry.LOCATION_SLICE_URI CustomSliceRegistry.LOCATION_SLICE_URI
); );
private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList( private static final List<Uri> SPECIAL_CASE_OEM_URIS = android.app.Flags.modesUi()
? Arrays.asList(
CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
CustomSliceRegistry.WIFI_CALLING_URI
) :
Arrays.asList(
CustomSliceRegistry.ZEN_MODE_SLICE_URI, CustomSliceRegistry.ZEN_MODE_SLICE_URI,
CustomSliceRegistry.FLASHLIGHT_SLICE_URI, CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI, CustomSliceRegistry.MOBILE_DATA_SLICE_URI,